Mercurial > public > mercurial-scm > hg
diff tests/test-excessive-merge @ 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 | c0b449154a90 |
line wrap: on
line diff
--- a/tests/test-excessive-merge Thu Nov 30 19:50:28 2006 -0600 +++ b/tests/test-excessive-merge Thu Nov 30 22:38:48 2006 -0600 @@ -31,13 +31,13 @@ echo echo 1 -hg manifest 1 +hg manifest --debug 1 echo 2 -hg manifest 2 +hg manifest --debug 2 echo 3 -hg manifest 3 +hg manifest --debug 3 echo 4 -hg manifest 4 +hg manifest --debug 4 echo