Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-rename-merge1.out @ 3297:fa59d6763441

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with upstream
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 09 Oct 2006 21:22:55 +0200
parents 764688cf51e5
children e7abcf3a7c5f
line wrap: on
line diff
--- a/tests/test-rename-merge1.out
+++ b/tests/test-rename-merge1.out
@@ -20,3 +20,7 @@ M b2
 R a
 C c2
 blahblah
+   rev    offset  length   base linkrev nodeid       p1           p2
+     0         0      67      0       1 dc51707dfc98 000000000000 000000000000
+     1        67      72      1       3 b2494a44f0a9 000000000000 dc51707dfc98
+renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66