summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-19 13:15:41 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-19 13:15:41 -0700
commit9b502a371e9bc340a537bb19d9a00750428e1651 (patch)
tree7a9cb72308c7238e01e33bda876a78550da48dc3 /git-mergetool--lib.sh
parent167a5800cb707ed489c3cb88174ee21e95a610ae (diff)
parente810715528eda01914d2df82628872e8df9929d5 (diff)
downloadgit-9b502a371e9bc340a537bb19d9a00750428e1651.tar.gz
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