Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 15501:2371f4aea665

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: give a special message for internal:merge failure (issue3105)
author Matt Mackall <mpm@selenic.com>
date Wed, 16 Nov 2011 18:04:19 -0600
parents 157d93c41c10
children e86dd8dfdea0
comparison
equal deleted inserted replaced
15500:d5abe76da61e 15501:2371f4aea665
260 260
261 if _toolbool(ui, tool, "fixeol"): 261 if _toolbool(ui, tool, "fixeol"):
262 _matcheol(repo.wjoin(fd), back) 262 _matcheol(repo.wjoin(fd), back)
263 263
264 if r: 264 if r:
265 ui.warn(_("merging %s failed!\n") % fd) 265 if tool == "internal:merge":
266 ui.warn(_("merging %s incomplete! "
267 "(edit conflicts, then use 'hg resolve --mark')\n") % fd)
268 else:
269 ui.warn(_("merging %s failed!\n") % fd)
266 else: 270 else:
267 os.unlink(back) 271 os.unlink(back)
268 272
269 os.unlink(b) 273 os.unlink(b)
270 os.unlink(c) 274 os.unlink(c)