Mercurial > hg

diff tests/test-rename-after-merge.out @ 5608:784eadabd985

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copy: simplify inner copy - save dirstate lookup and exists check - do all fs work inside a single dryrun clause - move unlinking into inner copy section - move target dir creation - eliminate undelete mess - fix a bug on mv a -> b -> a after merge
author Matt Mackall <mpm@selenic.com>
date Fri, 07 Dec 2007 02:01:13 -0600
parents c6682cdada2f
children 0750f11152fe
line wrap: on
line diff
--- a/tests/test-rename-after-merge.out	Fri Dec 07 02:01:10 2007 -0600
+++ b/tests/test-rename-after-merge.out	Fri Dec 07 02:01:13 2007 -0600
@@ -14,7 +14,9 @@
 (run 'hg heads' to see heads, 'hg merge' to merge)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
+M b
 % rename b as c
 A c
 R b
 % rename back c as b
+M b