Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge-types.t @ 26893:19c4b93cb7d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: move :merge-local/other symlink check to precheck In upcoming patches we're going to add more checks to the function currently named _symlinkcheck. This consolidates all those checks.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 08 Nov 2015 23:42:44 -0800
parents 4b966aaadc45
children 7a8e9a985c3b
line wrap: on
line diff
--- a/tests/test-merge-types.t	Sun Nov 08 23:47:20 2015 -0800
+++ b/tests/test-merge-types.t	Sun Nov 08 23:42:44 2015 -0800
@@ -118,7 +118,7 @@
   picked tool ':merge-local' for a (binary False symlink True)
   merging a
   my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
-  warning: :merge-local cannot merge symlinks for a
+  warning: internal :merge-local cannot merge symlinks for a
   0 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]
@@ -140,7 +140,7 @@
   picked tool ':merge-other' for a (binary False symlink True)
   merging a
   my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
-  warning: :merge-other cannot merge symlinks for a
+  warning: internal :merge-other cannot merge symlinks for a
   0 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]