From: Charles Bailey <charles@hashpling.org>
Date: Thu, 13 Nov 2008 12:41:12 GMT
Subject: git mergetool enhancements
Message-ID: <1226580075-29289-1-git-send-email-charles@hashpling.org>

Reroll of previously sent mergetool enhancements. Now using -y as the short
option for --no-prompt, but otherwise the same as before.