Mercurial > hg-stable
comparison tests/test-merge-default.out @ 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 | 013921c753bd |
| children | 9cd6578750b9 |
comparison
equal
deleted
inserted
replaced
| 3735:205f0fd4a4a1 | 3736:ad3d5b4367cb |
|---|