From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Jun 2014 19:06:43 +0000 (-0700)
Subject: Merge branch 'fc/mergetools-vimdiff3'
X-Git-Tag: v2.1.0-rc0~193
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3a9dae783bb66c18409d42d07949456dde8c4c62

Merge branch 'fc/mergetools-vimdiff3'

* fc/mergetools-vimdiff3:
mergetools: add vimdiff3 mode
---

3a9dae783bb66c18409d42d07949456dde8c4c62