Mercurial > public > mercurial-scm > hg-stable

diff tests/test-issue672.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 8abd9f785030
line wrap: on
line diff
--- a/tests/test-issue672.t	Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-issue672.t	Wed Nov 25 14:25:26 2015 -0800
@@ -66,7 +66,7 @@
    ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
    preserving 1a for resolve of 1a
    1a: local copied/moved from 1 -> m (premerge)
-  picked tool ':merge' for 1a (binary False symlink False)
+  picked tool ':merge' for 1a (binary False symlink False changedelete False)
   merging 1a and 1 to 1a
   my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
    premerge successful
@@ -89,7 +89,7 @@
    preserving 1 for resolve of 1a
   removing 1
    1a: remote moved from 1 -> m (premerge)
-  picked tool ':merge' for 1a (binary False symlink False)
+  picked tool ':merge' for 1a (binary False symlink False changedelete False)
   merging 1 and 1a to 1a
   my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d
    premerge successful