Mercurial > hg-stable

diff tests/test-copy-move-merge.t @ 18362:5a4f220fbfca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: report found copies sorted
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 12 Dec 2012 02:38:14 +0100
parents 760c0d67ce5e
children 5ed6a375e9ca
line wrap: on
line diff
--- a/tests/test-copy-move-merge.t	Tue Jan 15 02:59:12 2013 +0100
+++ b/tests/test-copy-move-merge.t	Wed Dec 12 02:38:14 2012 +0100
@@ -25,8 +25,8 @@
      b
      c
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     src: 'a' -> dst: 'b' *
      src: 'a' -> dst: 'c' *
-     src: 'a' -> dst: 'b' *
     checking for directory renames
   resolving manifests
    overwrite: False, partial: False