Mercurial > hg-stable
comparison tests/test-merge7.t @ 15625:efdcce3fd2d5
merge: make debug output easier to read
I always found it hard to figure out what the debug code meant without
the separators.
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Fri, 09 Dec 2011 17:34:53 +0100 |
| parents | 2371f4aea665 |
| children | f2719b387380 |
comparison
equal
deleted
inserted
replaced
| 15624:be43234a6d60 | 15625:efdcce3fd2d5 |
|---|---|
| 79 added 1 changesets with 1 changes to 1 files (+1 heads) | 79 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 80 (run 'hg heads' to see heads, 'hg merge' to merge) | 80 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 81 $ hg merge --debug | 81 $ hg merge --debug |
| 82 searching for copies back to rev 1 | 82 searching for copies back to rev 1 |
| 83 resolving manifests | 83 resolving manifests |
| 84 overwrite None partial False | 84 overwrite: False, partial: False |
| 85 ancestor 96b70246a118 local 50c3a7e29886+ remote 40d11a4173a8 | 85 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 |
| 86 test.txt: versions differ -> m | 86 test.txt: versions differ -> m |
| 87 preserving test.txt for resolve of test.txt | 87 preserving test.txt for resolve of test.txt |
| 88 updating: test.txt 1/1 files (100.00%) | 88 updating: test.txt 1/1 files (100.00%) |
| 89 picked tool 'internal:merge' for test.txt (binary False symlink False) | 89 picked tool 'internal:merge' for test.txt (binary False symlink False) |
| 90 merging test.txt | 90 merging test.txt |