summaryrefslogtreecommitdiff
path: root/t/t2000-checkout-cache-clash.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-22 11:26:56 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-22 11:26:56 -0700
commit2c697a67b14d432b844e996243633711ef5f4b32 (patch)
treea973a7df63f238cd7a6849dd9d29031a0a83fa9d /t/t2000-checkout-cache-clash.sh
parent4aaafdc6f14b3ae79cd35158767d842b62eaad08 (diff)
parentfa04ae0be8cca1291a60bc8a393f9c52d2582089 (diff)
downloadgit-2c697a67b14d432b844e996243633711ef5f4b32.tar.gz
Merge branch 'ap/combine-diff-ignore-whitespace' into maint
* ap/combine-diff-ignore-whitespace: Allow combined diff to ignore white-spaces
Diffstat (limited to 't/t2000-checkout-cache-clash.sh')
0 files changed, 0 insertions, 0 deletions