Re: git mergetool: create temporary files in different sub-folders but with same filenames

2015-06-02 Thread Stefan Beller
On Tue, Jun 2, 2015 at 11:48 AM, Andre Bossert wrote: > Hello, > > we are moving from ClearCase to Git (MSYS 1.9.5 at Win7x64) and trying to > configure one special merge tool "DiffMerge" for IBM Rhapsody files. So > we've added our merge tool (script) to gitconfig. The merge script calls the > Di

git mergetool: create temporary files in different sub-folders but with same filenames

2015-06-02 Thread Andre Bossert
Hello, we are moving from ClearCase to Git (MSYS 1.9.5 at Win7x64) and trying to configure one special merge tool "DiffMerge" for IBM Rhapsody files. So we've added our merge tool (script) to gitconfig. The merge script calls the DiffMerge for some file-extensions (sbs, rpy etc.). It works in