![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:36:01 +0000 (09:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:36:01 +0000 (09:36 -0700) | ||
| commit | 12f7559e0634c4b4348924cd7bfc70558d082eb8 | |
| tree | fff22904cb924a9dfb4fc23ab14280aaaa3cfdd5 | tree | snapshot |
| parent | 5c53513929699d8562b88e6b995d0184678f2c28 | commit | diff |
| parent | 829ef383a2b03a614d7d23e575270f2b10a805c1 | commit | diff |
Merge branch 'dm/mergetool-vimdiff' into next
* dm/mergetool-vimdiff:
mergetool-lib: add a three-way diff view for vim/gvim
mergetool-lib: combine vimdiff and gvimdiff run blocks
* dm/mergetool-vimdiff:
mergetool-lib: add a three-way diff view for vim/gvim
mergetool-lib: combine vimdiff and gvimdiff run blocks