From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Oct 2010 04:47:11 +0000 (-0700)
Subject: Merge branch 'dm/mergetool-vimdiff'
X-Git-Tag: v1.7.4-rc0~166
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0141215c9b1b95b6b9619358ab13e0f56e1cd01c;p=git.git

Merge branch 'dm/mergetool-vimdiff'

* dm/mergetool-vimdiff:
  mergetool-lib: make the three-way diff the default for vim/gvim
  mergetool-lib: add a three-way diff view for vim/gvim
  mergetool-lib: combine vimdiff and gvimdiff run blocks
---

0141215c9b1b95b6b9619358ab13e0f56e1cd01c