Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with spaces with TortoiseGitMerge

2013-02-01 Thread Sven Strickroth
TortoiseGitMerge, unlike TortoiseMerge, can be told to handle paths with spaces in them by using -option $FILE (not -option:$FILE, which does not work for such paths) syntax. This change was necessary because of MSYS path mangling [1], the : after the base etc. arguments to TortoiseMerge caused

Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with spaces with TortoiseGitMerge

2013-02-01 Thread David Aguilar
On Fri, Feb 1, 2013 at 12:16 PM, Sven Strickroth sven.strickr...@tu-clausthal.de wrote: TortoiseMerge caused to whole argument instead of just the file name to be quoted s/caused to whole/caused the whole/ I think this commit message is very nice. Is it too late to replace the current patch

Re: [PATCH] mergetools: Enable tortoisemerge to handle filenames with spaces with TortoiseGitMerge

2013-02-01 Thread Junio C Hamano
David Aguilar dav...@gmail.com writes: On Fri, Feb 1, 2013 at 12:16 PM, Sven Strickroth sven.strickr...@tu-clausthal.de wrote: TortoiseMerge caused to whole argument instead of just the file name to be quoted s/caused to whole/caused the whole/ I think this commit message is very nice.