diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-20 00:15:41 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-20 00:15:41 +0400 |
| commit | 9b502a371e9bc340a537bb19d9a00750428e1651 (patch) | |
| tree | 7a9cb72308c7238e01e33bda876a78550da48dc3 /git-mergetool--lib.sh | |
| parent | 167a5800cb707ed489c3cb88174ee21e95a610ae (diff) | |
| parent | e810715528eda01914d2df82628872e8df9929d5 (diff) | |
Merge branch 'ph/format-patch-no-color'
* ph/format-patch-no-color:
t4014: clean up format.thread config after each test
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions