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

Merge branch 'dm/mergetool-vimdiff' into next

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

12f7559e0634c4b4348924cd7bfc70558d082eb8