Mercurial > public > mercurial-scm > hg

diff tests/test-copy-move-merge.t @ 18360:760c0d67ce5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: process files in sorted order
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 02:59:12 +0100
parents a6fe1b9cc68f
children 5a4f220fbfca
line wrap: on
line diff
--- a/tests/test-copy-move-merge.t	Wed Dec 12 02:38:14 2012 +0100
+++ b/tests/test-copy-move-merge.t	Tue Jan 15 02:59:12 2013 +0100
@@ -31,8 +31,8 @@
   resolving manifests
    overwrite: False, partial: False
    ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
+   a: remote moved to b -> m
    a: remote moved to c -> m
-   a: remote moved to b -> m
   preserving a for resolve of b
   preserving a for resolve of c
   removing a