Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 26071:ff12a6c63c3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add 'union' merge to internal merge tool 'union merge' is a merge strategy which adds both left and right hand side of a conflict region. Git implements this merge strategy which is very practical to have for merging e.g. the Changelog file.
author Erik Huelsmann <ehuels@gmail.com>
date Sun, 16 Aug 2015 10:19:00 +0200
parents e15966216aec
children a4da463df6cf
comparison
equal deleted inserted replaced
26070:e15966216aec 26071:ff12a6c63c3d
246 246
247 r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode) 247 r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode)
248 return True, r 248 return True, r
249 return False, 0 249 return False, 0
250 250
251 @internaltool('union', True,
252 _("merging %s incomplete! "
253 "(edit conflicts, then use 'hg resolve --mark')\n"))
254 def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
255 """
256 Uses the internal non-interactive simple merge algorithm for merging
257 files. It will use both left and right sides for conflict regions.
258 No markers are inserted."""
259 return _merge(repo, mynode, orig, fcd, fco, fca, toolconf,
260 files, labels, 'union')
261
251 @internaltool('merge', True, 262 @internaltool('merge', True,
252 _("merging %s incomplete! " 263 _("merging %s incomplete! "
253 "(edit conflicts, then use 'hg resolve --mark')\n")) 264 "(edit conflicts, then use 'hg resolve --mark')\n"))
254 def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): 265 def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
255 """ 266 """