14 Sep
2011
14 Sep
'11
1:36 p.m.
Henning Westerholt writes:
AFAIK there is also a GUI frontend, it can be called with 'git mergetool'. Maybe its easier this way.
thank for the tip, but i already gave up with manual merge. instead i created a new branch and deleted the one that stopped working.
-- juha