Running TortoiseMerge from git gui

[psusi]

Is there a way to have git gui run TortoiseMerge to compare the base
vs current files side by side, instead of the diff view? It looks
like the tools menu might be capable of doing this, but I can't find
any documentation on what shell variables to use for the two file
versions.

[Sebastian Schuberth]

Git in general supports TortoiseMerge out of the box, but only as a merge tool, not as a diff tool. That said, I'm not sure if this is want you want, but using TortoiseMerge is just a matter of

$ git config --global merge.tool tortoisemerge

And if TortoiseMerge.exe is not in your PATH, additionally

$ git config --global mergetool.tortoisemerge.path "C:/Program Files/TortoiseSVN/bin/TortoiseMerge.exe"

If you do a merge in git gui now, you should be able to use TortoiseMerge to resolve any conflicts.

PS: The information at [1] is outdated, that was before Git learned to use TortoiseMerge directly.

[1] http://programmersunlimited.wordpress.com/2010/07/01/getting-git-to-use-tortoisemerge/

--
Sebastian Schuberth

[Phillip Susi]

On 11/10/2011 8:15 AM, Sebastian Schuberth wrote:
> Git in general supports TortoiseMerge out of the box, but only as a
> merge tool, not as a diff tool. That said, I'm not sure if this is

Yes, I have it set up for merge, and even have gitk able to right click
on a file and launch it as the external diff viewer, but I really would
like to be able to do that in git-gui.

[Sebastian Schuberth]

On Thu, Nov 10, 2011 at 16:08, Phillip Susi <ps...@cfl.rr.com> wrote:

>> Git in general supports TortoiseMerge out of the box, but only as a
>> merge tool, not as a diff tool. That said, I'm not sure if this is
>
> Yes, I have it set up for merge, and even have gitk able to right click on a
> file and launch it as the external diff viewer, but I really would like to
> be able to do that in git-gui.

I don't use git gui that much, but it guess it generally cannot launch
an external difftool (in contrast to gitk). So I believe you're stuck
with the textual diff it provides.

--
Sebastian Schuberth

[Sam Sherlock]

I have been keen to sup-up diff viewing, not yet tried
but I did find some ideas.  I am hoping to be able to get meld working
on ubunutu and WINMERGE in win7

http://stackoverflow.com/questions/255202/how-do-i-view-git-diff-output-with-visual-diff-program

 - S

[Sebastian Schuberth]

On Mon, Nov 14, 2011 at 01:14, Sam Sherlock <sam.sh...@gmail.com> wrote:

> I have been keen to sup-up diff viewing, not yet tried
> but I did find some ideas.  I am hoping to be able to get meld working
> on ubunutu and WINMERGE in win7

The problem is not to get a visual diff / merge program to work with
Git in general. That should be straight forward in current versions
using "git config diff.tool / merge.tool". The particluar problem in
this thread is to go get the visual diff program not only to work with
"git difftool" from the command line, but also being able to launch it
from git gui.

--
Sebastian Schuberth