Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 26519:48476c6129a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: run symlink check for :merge3 Just like :merge, :merge3 doesn't support merging symlinks.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 00:27:23 -0700
parents a77679d0b887
children abc2327e382a
line wrap: on
line diff
--- a/mercurial/filemerge.py	Wed Oct 07 00:24:44 2015 -0700
+++ b/mercurial/filemerge.py	Wed Oct 07 00:27:23 2015 -0700
@@ -279,7 +279,8 @@
 
 @internaltool('merge3', True,
               _("merging %s incomplete! "
-                "(edit conflicts, then use 'hg resolve --mark')\n"))
+                "(edit conflicts, then use 'hg resolve --mark')\n"),
+              precheck=_symlinkcheck)
 def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     """
     Uses the internal non-interactive simple merge algorithm for merging