equal
deleted
inserted
replaced
34 ui.warn(_("couldn't find merge tool %s\n") % tmsg) |
34 ui.warn(_("couldn't find merge tool %s\n") % tmsg) |
35 elif symlink and not _toolbool(ui, tool, "symlink"): |
35 elif symlink and not _toolbool(ui, tool, "symlink"): |
36 ui.warn(_("tool %s can't handle symlinks\n") % tmsg) |
36 ui.warn(_("tool %s can't handle symlinks\n") % tmsg) |
37 elif binary and not _toolbool(ui, tool, "binary"): |
37 elif binary and not _toolbool(ui, tool, "binary"): |
38 ui.warn(_("tool %s can't handle binary\n") % tmsg) |
38 ui.warn(_("tool %s can't handle binary\n") % tmsg) |
|
39 elif not util.gui() and _toolbool(ui, tool, "gui"): |
|
40 ui.warn(_("tool %s requires a GUI\n") % tmsg) |
39 else: |
41 else: |
40 return True |
42 return True |
41 return False |
43 return False |
42 |
44 |
43 # HGMERGE takes precedence |
45 # HGMERGE takes precedence |