tags:

views:

590

answers:

1

Hi guys, I want to use xxdiff for my merging needs. I have just started using git, and I integrated xxdiff to work with it on (git mergetool).

My problem is that I can't find any resource that teaches the basic of merging branches with xxdiff, so I get into this three file window with LOCAL BASE REMOTE, but I don't know where to start to get my merge done.

Could anyone point me to a good resource to learn xxdiff merge basics quickly ?

Thank you very much.

+4  A: 
VonC