[PATCH 0 of 2] two improvements for filemerge.py

Steve Borho steve at borho.org
Mon Feb 4 20:27:07 CST 2008


The first patch wraps quotes around the detected executable name to
protect against shell escaping problems.  HGMERGE is unmodified.
ui.merge still goes through _findtool() and thus will fail to be
detected (and unused) if any arguments are specified.

The second patch catches merge tools that return 0 (success) without
writing any output.  At least DiffMerge is known to do this if you
quit without saving.

I'll send another patch that tries to allow non-trivial ui.merge
configurations.

--
Steve


More information about the Mercurial-devel mailing list