From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Fri, 25 Mar 2011 08:26:47 +0000 (+0000)
Subject: Merge branch 'ss/git-gui-mergetool'
X-Git-Tag: gitgui-0.14.0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4c36ee7b0587083f82a6359a3b14cf6c73c65d34;p=git.git

Merge branch 'ss/git-gui-mergetool'
---

fbc9629e2f0cd31ab08638ebbd8f98a323329a5b