Code

Merge branch 'mg/maint-difftool-vim-readonly' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700)
commit13a39e2d865cbc8e1f6d6b71f54b7e4fdfd054a3
treec876ed9284f86e8eb2ec64c364b6009cab3f871d
parentc9b7cc04739bd744f7f28742de9ac65a61adebc2
parent853c0ffe42fef0bd1abd5cc69d5e93fdd5a708aa
Merge branch 'mg/maint-difftool-vim-readonly' into maint

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