changeset 26519 | 48476c6129a2 |
parent 26518 | a77679d0b887 |
child 26525 | abc2327e382a |
--- 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