Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 26518:a77679d0b887

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: print correct name of tool for symlink checks Earlier we'd print ':merge' even if the tool was something else like ':union'. That's clearly a bug.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 00:24:44 -0700
parents d8463a743d7d
children 48476c6129a2
comparison
equal deleted inserted replaced
26517:d8463a743d7d 26518:a77679d0b887
229 return 1 # continue merging 229 return 1 # continue merging
230 230
231 def _symlinkcheck(repo, mynode, orig, fcd, fco, fca, toolconf): 231 def _symlinkcheck(repo, mynode, orig, fcd, fco, fca, toolconf):
232 tool, toolpath, binary, symlink = toolconf 232 tool, toolpath, binary, symlink = toolconf
233 if symlink: 233 if symlink:
234 repo.ui.warn(_('warning: internal :merge cannot merge symlinks ' 234 repo.ui.warn(_('warning: internal %s cannot merge symlinks '
235 'for %s\n') % fcd.path()) 235 'for %s\n') % (tool, fcd.path()))
236 return False 236 return False
237 return True 237 return True
238 238
239 def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode): 239 def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode):
240 """ 240 """