summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-14 12:57:17 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-14 12:57:17 -0800
commit63d37c3062e13cb2828edf63bc03cce1b6c41fd0 (patch)
tree058aa2fe3f357e626c3458a89443ea07fa0f5345 /mergetools
parent5f90b6fa0f5cf1d06bc72ffe607be3cd6aa955b5 (diff)
parent6680a0874f86600cc8b4b5327384934d83d752a8 (diff)
downloadgit-63d37c3062e13cb2828edf63bc03cce1b6c41fd0.tar.gz
Merge branch 'jk/userdiff-config-simplify'
* jk/userdiff-config-simplify: drop odd return value semantics from userdiff_config
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions