My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9b7cc0 853c0ff)
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)
* mg/maint-difftool-vim-readonly:
  mergetool-lib: call vim in readonly mode for diffs


Trivial merge
The core git plumbing