Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rebase-collapse.t
changeset 20945 18adc15635a1
parent 20766 95aab23a806b
child 22206 6122ad50e38f 
--- 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
mercurial