Mercurial > hg
diff tests/test-merge-types.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 | bd625cd4e5e7 |
children | a77679d0b887 |
line wrap: on
line diff
--- a/tests/test-merge-types.t Tue Oct 06 22:57:21 2015 -0700 +++ b/tests/test-merge-types.t Wed Oct 07 00:01:16 2015 -0700 @@ -36,7 +36,7 @@ ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c preserving a for resolve of a a: versions differ -> m - picked tool 'internal:merge' for a (binary False symlink True) + picked tool ':merge' for a (binary False symlink True) merging a my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da warning: internal :merge cannot merge symlinks for a @@ -69,7 +69,7 @@ ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f preserving a for resolve of a a: versions differ -> m - picked tool 'internal:merge' for a (binary False symlink True) + picked tool ':merge' for a (binary False symlink True) merging a my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da warning: internal :merge cannot merge symlinks for a