changeset 27161 | 296d55def9c4 |
parent 26976 | c48fee950ce4 |
child 27624 | d46db4390715 |
--- a/tests/test-backout.t Sat Nov 28 17:06:29 2015 +0800 +++ b/tests/test-backout.t Wed Nov 25 14:25:26 2015 -0800 @@ -709,7 +709,7 @@ update: (current) phases: 3 draft $ hg resolve --all --debug - picked tool ':merge' for foo (binary False symlink False) + picked tool ':merge' for foo (binary False symlink False changedelete False) merging foo my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 premerge successful