![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Oct 2010 04:47:11 +0000 (21:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Oct 2010 04:47:11 +0000 (21:47 -0700) | ||
| commit | 0141215c9b1b95b6b9619358ab13e0f56e1cd01c | |
| tree | a3e096b778f2c87cf694126df2a3d36ce600016b | tree | snapshot |
| parent | 91e811e0e80e55d580ba3601176ac84b28ad4479 | commit | diff |
| parent | 000866909a5d9233c89d8fcc33a8125cc84f24d6 | commit | diff |
Merge branch 'dm/mergetool-vimdiff'
* 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
* 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