diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-01 12:45:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-01 12:45:14 -0700 |
| commit | 324a9f41cbf96ad994efc3b20be239116eba0dae (patch) | |
| tree | 496fc12b58b69d8795315049e89a6dbb0737471a /test-sha1.sh | |
| parent | Merge branch 'mc/commit-doc-grammofix' (diff) | |
| parent | mergetools: add winmerge as a builtin tool (diff) | |
| download | tgif-324a9f41cbf96ad994efc3b20be239116eba0dae.tar.xz | |
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 'test-sha1.sh')
0 files changed, 0 insertions, 0 deletions