| commit | 324a9f41cbf96ad994efc3b20be239116eba0dae | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Jun 2015 19:45:14 +0000 (1 12:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Jun 2015 19:45:14 +0000 (1 12:45 -0700) | ||
| tree | 496fc12b58b69d8795315049e89a6dbb0737471a | treesnapshot (tar.gz zip) |
| parent | 1fd63cac50ea2ea95bb217a45c72084af3353d4f | commitdiff |
| parent | 3e4f2373b295e19dbc1a6bd0e743f65b500b7bda | commitdiff |
Merge branch 'da/mergetool-winmerge'
"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