Re: [PATCH] mergetools: Add tortoisegitmerge helper

2013-01-25 Thread John Keeping
On Thu, Jan 24, 2013 at 11:54:25PM -0800, David Aguilar wrote: > On Thu, Jan 24, 2013 at 11:21 PM, Junio C Hamano wrote: > > Is there a way for me to programatically tell what merge.tool and > > diff.tool could be enabled for a particular source checkout of Git > > regardless of what platform am I

Re: [PATCH] mergetools: Add tortoisegitmerge helper

2013-01-24 Thread David Aguilar
On Thu, Jan 24, 2013 at 11:21 PM, Junio C Hamano wrote: > David Aguilar writes: > This paragraph needs to be rewritten to unconfuse readers. The > original is barely intelligible, and it becomes unreadable as the > set of tools subtracted by "minus" and added by "plus" grows. >>

Re: [PATCH] mergetools: Add tortoisegitmerge helper

2013-01-24 Thread Junio C Hamano
David Aguilar writes: > Even though the old tortoisemerge and the new tortoisegitmerge > have completely different syntax, could we still use the existence > of one when deciding which syntax to use? > ... > ...and then later merge_cmd and diff_cmd > can delegate to {diff,merge}_cmd_legacy() and

Re: [PATCH] mergetools: Add tortoisegitmerge helper

2013-01-24 Thread David Aguilar
On Thu, Jan 24, 2013 at 2:15 PM, Junio C Hamano wrote: > Sven Strickroth writes: > >> Am 24.01.2013 20:51 schrieb Junio C Hamano: >>> Sven Strickroth writes: >>> - The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe (starting with 1.8.0) in order to make clear that

Re: [PATCH] mergetools: Add tortoisegitmerge helper

2013-01-24 Thread Junio C Hamano
Sven Strickroth writes: > Am 24.01.2013 20:51 schrieb Junio C Hamano: >> Sven Strickroth writes: >> >>> - 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 confusi

Re: [PATCH] mergetools: Add tortoisegitmerge helper

2013-01-24 Thread Sven Strickroth
Am 24.01.2013 20:51 schrieb Junio C Hamano: > Sven Strickroth writes: > >> - 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 TortoiseM

Re: [PATCH] mergetools: Add tortoisegitmerge helper

2013-01-24 Thread Junio C Hamano
Sven Strickroth writes: > - 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. Wouldn't it make more sense in s

Re: [PATCH] mergetools: Add tortoisegitmerge helper

2013-01-24 Thread Sven Strickroth
Am 21.01.2013 09:26 schrieb 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. > - The tortoi

[PATCH] mergetools: Add tortoisegitmerge helper

2013-01-21 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. - The tortoisemerge mergetool does not work with filenames which ha

[PATCH] mergetools: Add tortoisegitmerge helper

2013-01-21 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. - The tortoisemerge mergetool does not work with filenames which ha

Re: [PATCH] mergetools: Add tortoisegitmerge helper

2013-01-20 Thread Junio C Hamano
Sven Strickroth writes: > - 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. > - The tortoisemerge mergetool d

[PATCH] mergetools: Add tortoisegitmerge helper

2013-01-20 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. - The tortoisemerge mergetool does not work with filenames which ha