Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-collapse.t @ 20945:18adc15635a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: keep destination filename as key in filemerge actions Gives more readable debug output and makes it possible to compare/merge actions later.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 02 Mar 2014 18:52:16 +0100
parents 95aab23a806b
children 6122ad50e38f
line wrap: on
line diff
--- a/tests/test-rebase-collapse.t	Sun Mar 02 18:49:36 2014 +0100
+++ b/tests/test-rebase-collapse.t	Sun Mar 02 18:52:16 2014 +0100
@@ -632,8 +632,8 @@
   merging a and d to d
   merging b and e to e
   merging c and f to f
+  merging f and c to c
   merging e and g to g
-  merging f and c to c
   saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob)
   $ hg st
   $ hg st --copies --change tip