Mercurial > hg-stable

diff tests/test-copy-move-merge.t @ 27161:296d55def9c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add debug output for whether this is a change/delete conflict Just like binary and symlink conflicts, change/delete conflicts influence the tool picked.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 25 Nov 2015 14:25:26 -0800
parents 8e6d5b7317e6
children 27b89a0957ec
line wrap: on
line diff
--- a/tests/test-copy-move-merge.t	Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-copy-move-merge.t	Wed Nov 25 14:25:26 2015 -0800
@@ -35,12 +35,12 @@
    preserving a for resolve of c
   removing a
    b: remote moved from a -> m (premerge)
-  picked tool ':merge' for b (binary False symlink False)
+  picked tool ':merge' for b (binary False symlink False changedelete False)
   merging a and b to b
   my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
    premerge successful
    c: remote moved from a -> m (premerge)
-  picked tool ':merge' for c (binary False symlink False)
+  picked tool ':merge' for c (binary False symlink False changedelete False)
   merging a and c to c
   my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
    premerge successful