diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-26 21:47:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-26 21:47:11 -0700 |
| commit | 0141215c9b1b95b6b9619358ab13e0f56e1cd01c (patch) | |
| tree | a3e096b778f2c87cf694126df2a3d36ce600016b /git-svn.perl | |
| parent | Merge branch 'kf/post-receive-sample-hook' (diff) | |
| parent | mergetool-lib: make the three-way diff the default for vim/gvim (diff) | |
| download | git-0141215c9b1b95b6b9619358ab13e0f56e1cd01c.tar.gz git-0141215c9b1b95b6b9619358ab13e0f56e1cd01c.zip | |
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
Diffstat (limited to 'git-svn.perl')
0 files changed, 0 insertions, 0 deletions