Mercurial > hg
diff tests/test-merge6.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 | 0750f11152fe |
line wrap: on
line diff
--- a/tests/test-merge6.out Sat Oct 06 21:19:06 2007 +0200 +++ b/tests/test-merge6.out Sat Oct 06 22:30:22 2007 +0200 @@ -11,7 +11,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) bar should remain deleted. -f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo +f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo pulling from ../A2 searching for changes adding changesets @@ -22,4 +22,4 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) bar should remain deleted. -f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo +f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo