On Fri, Jan 25, 2013 at 5:17 PM, Sven Strickroth
[off-list ref] wrote:
TortoiseGitMerge now separates cli parameter key-values by space instead
of colons as TortoiseSVN TortoiseMerge does and supports filesnames
with spaces in it this way now.
These patches look correct (I do not have the tool to test)
but I think we should fixup this commit message.
How about something like...
mergetools: Teach tortoisemerge about TortoiseGitMerge
TortoiseGitMerge improved its syntax to allow for file paths
with spaces. Detect when it is installed and prefer it over
TortoiseMerge.
--
David