Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Apr 2014 18:59:16 +0000 (11:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Apr 2014 18:59:16 +0000 (11:59 -0700)
* jc/fix-diff-no-index-diff-opt-parse:
diff-no-index: correctly diagnose error return from diff_opt_parse()

1  2 
diff-no-index.c
diff --cc diff-no-index.c
Simple merge