Mercurial > public > mercurial-scm > hg
diff tests/test-merge-commit.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 | ec5886db9dc6 |
| children | f2719b387380 |
line wrap: on
line diff
--- a/tests/test-merge-commit.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-merge-commit.t Fri Dec 09 17:34:53 2011 +0100 @@ -69,8 +69,8 @@ $ hg --debug merge 3 searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 0f2ff26688b9 local 2263c1be0967+ remote 0555950ead28 + overwrite: False, partial: False + ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 bar: versions differ -> m preserving bar for resolve of bar updating: bar 1/1 files (100.00%) @@ -156,8 +156,8 @@ $ hg --debug merge 3 searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor 0f2ff26688b9 local 2263c1be0967+ remote 3ffa6b9e35f0 + overwrite: False, partial: False + ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 bar: versions differ -> m preserving bar for resolve of bar updating: bar 1/1 files (100.00%)