Mercurial > hg-stable

diff tests/test-tag.t @ 22707:38e0363dcbe0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: switch the default name for internal tools from internal:x to :x
author Mads Kiilerich <madski@unity3d.com>
date Sun, 28 Sep 2014 17:15:28 +0200
parents 8c65cc0f3c6b
children a074421fa4e1
line wrap: on
line diff
--- a/tests/test-tag.t	Sun Sep 28 17:15:25 2014 +0200
+++ b/tests/test-tag.t	Sun Sep 28 17:15:28 2014 +0200
@@ -517,7 +517,7 @@
   merging .hgtags
   automatic .hgtags merge failed
   the following 1 tags are in conflict: t7
-  automatic tag merging of .hgtags failed! (use 'hg resolve --tool internal:merge' or another merge tool of your choice)
+  automatic tag merging of .hgtags failed! (use 'hg resolve --tool :merge' or another merge tool of your choice)
   2 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]