changeset 20945 | 18adc15635a1 |
parent 20117 | aa9385f983fa |
child 21082 | 0d67fccc0d43 |
--- 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)