Mercurial > public > mercurial-scm > hg
diff tests/test-merge-types.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 | db0340f4b507 |
| children | ca5cc2976574 |
line wrap: on
line diff
--- a/tests/test-merge-types.t Fri Dec 09 15:50:33 2011 +0100 +++ b/tests/test-merge-types.t Fri Dec 09 17:34:53 2011 +0100 @@ -19,8 +19,8 @@ $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c + overwrite: False, partial: False + ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: update permissions -> e @@ -47,8 +47,8 @@ $ hg merge --debug searching for copies back to rev 1 resolving manifests - overwrite None partial False - ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f + overwrite: False, partial: False + ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: remote is newer -> g