Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-rename-merge1.out @ 3659:f4dece0f7016

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactor debugrenamed
author Matt Mackall <mpm@selenic.com>
date Wed, 15 Nov 2006 15:51:58 -0600
parents b16456909a0a
children 0fb66912040a
line wrap: on
line diff
--- a/tests/test-rename-merge1.out
+++ b/tests/test-rename-merge1.out
@@ -22,4 +22,4 @@ 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
+b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66