Mercurial > hg
diff tests/test-graft.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 | aa9385f983fa |
children | 0d67fccc0d43 |
line wrap: on
line diff
--- a/tests/test-graft.t Sun Mar 02 18:49:36 2014 +0100 +++ b/tests/test-graft.t Sun Mar 02 18:52:16 2014 +0100 @@ -137,7 +137,7 @@ resolving manifests branchmerge: True, force: True, partial: False ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 - b: local copied/moved to a -> m + b: local copied/moved from a -> m preserving b for resolve of b updating: b 1/1 files (100.00%) picked tool 'internal:merge' for b (binary False symlink False)