Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-excessive-merge.out @ 5405:8feb33c2d153
Display symlink or executable bit with manifest -v
New output looks like:
644 a
755 * b/a
644 @ l
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 06 Oct 2007 22:30:22 +0200 |
parents | b2ae81a7df29 |
children |
line wrap: on
line diff
--- a/tests/test-excessive-merge.out +++ b/tests/test-excessive-merge.out @@ -43,17 +43,17 @@ summary: test 4 275 29 3 4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2 1 -79d7492df40aa0fa093ec4209be78043c181f094 644 a -2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b +79d7492df40aa0fa093ec4209be78043c181f094 644 a +2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b 2 -2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a -79d7492df40aa0fa093ec4209be78043c181f094 644 b +2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a +79d7492df40aa0fa093ec4209be78043c181f094 644 b 3 -79d7492df40aa0fa093ec4209be78043c181f094 644 a -79d7492df40aa0fa093ec4209be78043c181f094 644 b +79d7492df40aa0fa093ec4209be78043c181f094 644 a +79d7492df40aa0fa093ec4209be78043c181f094 644 b 4 -79d7492df40aa0fa093ec4209be78043c181f094 644 a -79d7492df40aa0fa093ec4209be78043c181f094 644 b +79d7492df40aa0fa093ec4209be78043c181f094 644 a +79d7492df40aa0fa093ec4209be78043c181f094 644 b rev offset length base linkrev nodeid p1 p2 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000