Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-rename-merge1.out @ 3305:e7abcf3a7c5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: use contexts rather than my and other
author Matt Mackall <mpm@selenic.com>
date Mon, 09 Oct 2006 21:27:04 -0500
parents 764688cf51e5
children ecc1bf27378c
line wrap: on
line diff
--- a/tests/test-rename-merge1.out
+++ b/tests/test-rename-merge1.out
@@ -8,7 +8,7 @@ resolving manifests
  b2: remote created -> g
 merging a and b to b
 resolving a
-my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c
+my a@. other b@8e765a822af2 ancestor a@af1939970a1c
 copying a to b
 removing a
 getting b2