From: Sven Strickroth Date: Thu, 24 Jan 2013 11:19:29 GMT Subject: Re: [PATCH] mergetools: Add tortoisegitmerge helper Message-ID: <510118C1.9080704@tu-clausthal.de> In-Reply-To: <50FCFBBB.2080305@tu-clausthal.de> 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 tortoisemerge mergetool does not work with filenames which have > a space in it. Fixing this required changes in git and also in > TortoiseGitMerge; see https://github.com/msysgit/msysgit/issues/57. > > The new tortoisegitmerge helper was added so that people can still use > TortoiseMerge from TortoiseSVN (and older TortoiseGit versions). Any comments for this patch? -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server