From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Mar 2011 23:47:26 +0000 (-0700)
Subject: Merge branch 'mg/maint-difftool-vim-readonly' into maint
X-Git-Tag: v1.7.4.2~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=13a39e2d865cbc8e1f6d6b71f54b7e4fdfd054a3;p=git.git

Merge branch 'mg/maint-difftool-vim-readonly' into maint

* mg/maint-difftool-vim-readonly:
  mergetool-lib: call vim in readonly mode for diffs
---

13a39e2d865cbc8e1f6d6b71f54b7e4fdfd054a3