Mercurial > hg-stable
diff tests/test-graft.t @ 26517:d8463a743d7d
filemerge: normalize 'internal:foo' names to ':foo'
In upcoming patches we're going to present these names in the UI -- it would be
good not to present deprecated names.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 07 Oct 2015 00:01:16 -0700 |
| parents | d1530c6e8613 |
| children | a5ff66e6d77a |
line wrap: on
line diff
--- a/tests/test-graft.t Tue Oct 06 22:57:21 2015 -0700 +++ b/tests/test-graft.t Wed Oct 07 00:01:16 2015 -0700 @@ -154,7 +154,7 @@ ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 preserving b for resolve of b b: local copied/moved from a -> m - picked tool 'internal:merge' for b (binary False symlink False) + picked tool ':merge' for b (binary False symlink False) merging b and a to b my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 premerge successful @@ -184,7 +184,7 @@ getting d b: remote unchanged -> k e: versions differ -> m - picked tool 'internal:merge' for e (binary False symlink False) + picked tool ':merge' for e (binary False symlink False) merging e my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 warning: conflicts during merge.