Merge branch 'mg/maint-difftool-vim-readonly'
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Mar 2011 23:02:27 +0000 (15:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Mar 2011 23:02:27 +0000 (15:02 -0800)
commit08fd8710e277eed73a21c6c5483c57bfeb14e8a7
tree5d7341cdbf0f7076724615bde742a70b0ad08227
parent5cb3c9b7dff15f762d63df0b6f2d6b4bf82565e9
parent853c0ffe42fef0bd1abd5cc69d5e93fdd5a708aa
Merge branch 'mg/maint-difftool-vim-readonly'

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