Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
3294:80654c248793 3297:fa59d6763441
18 a 18 a
19 M b2 19 M b2
20 R a 20 R a
21 C c2 21 C c2
22 blahblah 22 blahblah
23 rev offset length base linkrev nodeid p1 p2
24 0 0 67 0 1 dc51707dfc98 000000000000 000000000000
25 1 67 72 1 3 b2494a44f0a9 000000000000 dc51707dfc98
26 renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66