]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
* mg/maint-difftool-vim-readonly:
  mergetool-lib: call vim in readonly mode for diffs


Trivial merge