Mercurial > public > mercurial-scm > hg-stable

diff tests/test-rename-after-merge @ 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 d821ea464465
line wrap: on
line diff
--- a/tests/test-rename-after-merge	Fri Dec 07 02:01:10 2007 -0600
+++ b/tests/test-rename-after-merge	Fri Dec 07 02:01:13 2007 -0600
@@ -24,6 +24,7 @@
 echo % merge repositories
 hg pull ../t2
 hg merge
+hg st
 
 echo % rename b as c
 hg mv b c