From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Sep 2010 22:26:36 +0000 (-0700)
Subject: Merge branch 'dm/mergetool-vimdiff' into next
X-Git-Tag: ko-next~203
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c8e22eafddf21ba05d050f7856922fdf5ffc35da;p=git.git

Merge branch 'dm/mergetool-vimdiff' into next

* dm/mergetool-vimdiff:
  mergetool-lib: make the three-way diff the default for vim/gvim
---

c8e22eafddf21ba05d050f7856922fdf5ffc35da