Re: [PATCH] mergetools: Enhance tortoisemerge to work with

2013-01-25 Thread Sven Strickroth
The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe (starting with 1.8.0) in order to make clear that this one has special support for git and prevent confusion with the TortoiseSVN TortoiseMerge version. Signed-off-by: Sven Strickroth --- mergetools/tortoisemerge | 11 +++

Re: [PATCH] mergetools: Enhance tortoisemerge to work with

2013-01-25 Thread Sven Strickroth
Am 25.01.2013 19:28 schrieb Junio C Hamano:> Sven Strickroth writes: > >> TortoiseGitMerge and filenames with spaces > > ??? ECANNOTPARSE. > > ... ah, wait. Is this a broken-off tail of your subject line? Yes. >> +touch "$BACKUP" >> +basename="$(basename "$merge_tool_pa

Re: [PATCH] mergetools: Enhance tortoisemerge to work with

2013-01-25 Thread Junio C Hamano
Sven Strickroth writes: > TortoiseGitMerge and filenames with spaces ??? ECANNOTPARSE. ... ah, wait. Is this a broken-off tail of your subject line? It may be a sign that you are doing too many unrelated things in a single patch when your subject does not fit on a single line. Perhaps this

[PATCH] mergetools: Enhance tortoisemerge to work with

2013-01-25 Thread Sven Strickroth
TortoiseGitMerge and filenames with spaces - The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe (starting with 1.8.0) in order to make clear that this one has special support for git, (uses spaces as cli parameter key-value separators) and prevent confusion with the Tort

Re: [PATCH] mergetools: Enhance tortoisemerge to work with

2013-01-25 Thread David Aguilar
On Fri, Jan 25, 2013 at 1:06 AM, Sven Strickroth wrote: > TortoiseGitMerge and filenames with spaces > > - The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe > (starting with 1.8.0) in order to make clear that this one has special > support for git, (uses spaces as cli para

[PATCH] mergetools: Enhance tortoisemerge to work with

2013-01-25 Thread Sven Strickroth
TortoiseGitMerge and filenames with spaces - The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe (starting with 1.8.0) in order to make clear that this one has special support for git, (uses spaces as cli parameter key-value separators) and prevent confusion with the Torto