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 _______________________________________________ sr-dev mailing list [email protected] http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
