Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge7.out @ 3233:3fd098e0902d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: extend file merge function for renames
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 12:04:48 -0500
parents 2ef0b3aae186
children e7abcf3a7c5f
line wrap: on
line diff
--- a/tests/test-merge7.out
+++ b/tests/test-merge7.out
@@ -27,7 +27,7 @@ resolving manifests
  test.txt: versions differ -> m
 merging test.txt
 resolving test.txt
-file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557
+my test.txt@451c744aabcc other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
 merging test.txt failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 There are unresolved merges, you can redo the full merge using: