From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 1 Feb 2009 01:43:28 +0000 (-0800)
Subject: Merge branch 'jg/mergetool'
X-Git-Tag: v1.6.2-rc0~50
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2edefe38a813deb4dfbd62dcf47520aeb1af15fc;p=git.git

Merge branch 'jg/mergetool'

* jg/mergetool:
  mergetool: Don't repeat merge tool candidates
---

2edefe38a813deb4dfbd62dcf47520aeb1af15fc