Mercurial > hg
diff tests/test-merge6 @ 3736:ad3d5b4367cb
make manifest friendlier
switch to using context code
..which uses first parent by default
show file hashes only with debug switch
show permissions with verbose
fix up tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 30 Nov 2006 22:38:48 -0600 |
parents | e506c14382fd |
children | a74586023196 |
line wrap: on
line diff
--- a/tests/test-merge6 Thu Nov 30 19:50:28 2006 -0600 +++ b/tests/test-merge6 Thu Nov 30 22:38:48 2006 -0600 @@ -36,11 +36,11 @@ hg merge hg commit -m "commit test" -d "1000000 0" echo bar should remain deleted. -hg manifest +hg manifest --debug cd ../B2 hg pull ../A2 hg merge hg commit -m "commit test" -d "1000000 0" echo bar should remain deleted. -hg manifest +hg manifest --debug