![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Sep 2010 22:26:36 +0000 (15:26 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Sep 2010 22:26:36 +0000 (15:26 -0700) | ||
| commit | c8e22eafddf21ba05d050f7856922fdf5ffc35da | |
| tree | 1deb59e1cc37a1e38c684e08eb4fe1af254e2d63 | tree | snapshot |
| parent | 5ad7d907713c930c6f559ffff0a15aba03141dd4 | commit | diff |
| parent | 000866909a5d9233c89d8fcc33a8125cc84f24d6 | commit | diff |
Merge branch 'dm/mergetool-vimdiff' into next
* dm/mergetool-vimdiff:
mergetool-lib: make the three-way diff the default for vim/gvim
* dm/mergetool-vimdiff:
mergetool-lib: make the three-way diff the default for vim/gvim