Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-up-local-change.out @ 3121:1c1e59aac82a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify local created logic
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 21:11:26 -0500
parents 40e777bda455
children 2ef0b3aae186
line wrap: on
line diff
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -33,7 +33,7 @@ summary:     2
 resolving manifests
  overwrite False branchmerge False partial False
  ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b
-remote deleted b
+remote deleted b, clobbering
 removing b
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 changeset:   0:33aaa84a386b