Mercurial > public > mercurial-scm > hg-stable

comparison 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
comparison
equal deleted inserted replaced
26518:a77679d0b887 26519:48476c6129a2
277 return _merge(repo, mynode, orig, fcd, fco, fca, toolconf, 277 return _merge(repo, mynode, orig, fcd, fco, fca, toolconf,
278 files, labels, 'merge') 278 files, labels, 'merge')
279 279
280 @internaltool('merge3', True, 280 @internaltool('merge3', True,
281 _("merging %s incomplete! " 281 _("merging %s incomplete! "
282 "(edit conflicts, then use 'hg resolve --mark')\n")) 282 "(edit conflicts, then use 'hg resolve --mark')\n"),
283 precheck=_symlinkcheck)
283 def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): 284 def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
284 """ 285 """
285 Uses the internal non-interactive simple merge algorithm for merging 286 Uses the internal non-interactive simple merge algorithm for merging
286 files. It will fail if there are any conflicts and leave markers in 287 files. It will fail if there are any conflicts and leave markers in
287 the partially merged file. Marker will have three sections, one from each 288 the partially merged file. Marker will have three sections, one from each