summaryrefslogtreecommitdiff
path: root/test-parse-options.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-29 13:43:13 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-29 13:43:13 -0700
commit934747323c397ffe64b6dcdf2bf73128d8e36968 (patch)
treea02906b87b716d48d56b9b0de209fe02da65969e /test-parse-options.c
parent3e73cb2f48cc4044905455a9936692f967a0f9b3 (diff)
parent7dae8b21c2fe39a59661c709f0dc17090dafa5a4 (diff)
downloadgit-934747323c397ffe64b6dcdf2bf73128d8e36968.tar.gz
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: diff -c -p: do not die on submodules
Diffstat (limited to 'test-parse-options.c')
0 files changed, 0 insertions, 0 deletions