From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 4 Mar 2011 23:02:27 +0000 (-0800)
Subject: Merge branch 'mg/maint-difftool-vim-readonly'
X-Git-Tag: v1.7.5-rc0~96
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=08fd8710e277eed73a21c6c5483c57bfeb14e8a7;p=git.git

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

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

08fd8710e277eed73a21c6c5483c57bfeb14e8a7