From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 8 Mar 2008 06:30:07 +0000 (-0800)
Subject: Merge branch 'cb/mergetool'
X-Git-Tag: v1.5.5-rc0~58
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/003b93cfb3f588284b89dc4e4c89e1046913ff59

Merge branch 'cb/mergetool'

* cb/mergetool:
Add a very basic test script for git mergetool
Teach git mergetool to use custom commands defined at config time
Changed an internal variable of mergetool to support custom commands
Tidy up git mergetool's backup file behaviour
---

003b93cfb3f588284b89dc4e4c89e1046913ff59