| commit | d6333e9eae30e89fc84e8f4ca36557a9df270238 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 May 2015 20:53:12 +0000 (26 13:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 May 2015 20:53:12 +0000 (26 13:53 -0700) | ||
| tree | 13d0e287fc13d67ab9292f4cd27dc2f915165149 | treesnapshot (tar.gz zip) |
| parent | 9d76e3ba2adc421182ecaef8e1f69264aa90cf29 | commitdiff |
| parent | 3e4f2373b295e19dbc1a6bd0e743f65b500b7bda | commitdiff |
Merge branch 'da/mergetool-winmerge' into next
"git mergetool" learned to drive WinMerge as a backend.
* da/mergetool-winmerge:
mergetools: add winmerge as a builtin tool
mergetool--lib: set IFS for difftool and mergetool
"git mergetool" learned to drive WinMerge as a backend.
* da/mergetool-winmerge:
mergetools: add winmerge as a builtin tool
mergetool--lib: set IFS for difftool and mergetool