I am on Debian Wheezy here and there was no default installation of a merge tool. I just installed kdiff. It did pull in a few dependancies though:-)
I hope you found Nick's suggestion better anyway.
-------- Original message --------
From Enno Borgsteede <email@example.com>
Date: 30/12/2013 14:03 (GMT+01:00)
Subject Re: [Gramps-devel] how can I handle merges in git pull?
Thanks. I can't find kdiff in the Mint repo's, possibly because
Cinnamon is Gnome based or so, and k suggests KDE.
I just went through a major merge using kdiff. It was
pretty easy to use. I chose it after a quick google showed it
was quite popular.
Next question: Was kdiff automatically invoked when you ran pull, or
are you following another procedure than I do.
Background: With svn update and an occasional manual merge, I lived
in a world that looked simple to me, and now, I'm still lost.