Mercurial > public > mercurial-scm > hg
diff tests/test-double-merge.t @ 20945:18adc15635a1
merge: keep destination filename as key in filemerge actions
Gives more readable debug output and makes it possible to compare/merge actions
later.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sun, 02 Mar 2014 18:52:16 +0100 |
| parents | bcf29565d89f |
| children | cb15835456cb |
line wrap: on
line diff
--- a/tests/test-double-merge.t Sun Mar 02 18:49:36 2014 +0100 +++ b/tests/test-double-merge.t Sun Mar 02 18:52:16 2014 +0100 @@ -35,11 +35,11 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 - foo: remote copied to bar -> m + bar: remote copied from foo -> m preserving foo for resolve of bar foo: versions differ -> m preserving foo for resolve of foo - updating: foo 1/2 files (50.00%) + updating: bar 1/2 files (50.00%) picked tool 'internal:merge' for bar (binary False symlink False) merging foo and bar to bar my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc