]> asedeno.scripts.mit.edu Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91e811e 0008669)
Merge branch 'dm/mergetool-vimdiff'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Oct 2010 04:47:11 +0000 (21:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Oct 2010 04:47:11 +0000 (21:47 -0700)
* dm/mergetool-vimdiff:
  mergetool-lib: make the three-way diff the default for vim/gvim
  mergetool-lib: add a three-way diff view for vim/gvim
  mergetool-lib: combine vimdiff and gvimdiff run blocks


Trivial merge
local clone of git.git