diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-01 22:45:14 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-01 22:45:14 +0300 |
| commit | 324a9f41cbf96ad994efc3b20be239116eba0dae (patch) | |
| tree | 496fc12b58b69d8795315049e89a6dbb0737471a /git-stash.sh | |
| parent | 1fd63cac50ea2ea95bb217a45c72084af3353d4f (diff) | |
| parent | 3e4f2373b295e19dbc1a6bd0e743f65b500b7bda (diff) | |
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
Diffstat (limited to 'git-stash.sh')
0 files changed, 0 insertions, 0 deletions