Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maint
commit693b407077bf3739b3609400845e3f6854830ee4
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Apr 2014 18:59:16 +0000 (9 11:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Apr 2014 18:59:16 +0000 (9 11:59 -0700)
tree7a675dbdf79abc347f2d8c095fe7e7724cbeb4f7
parentefb4ec68b82aa003e18c1731e17503d3bf8d15f4
parentad1c3fbd26d0aae50abfb3c7d654f7229ba9370d
Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maint

* jc/fix-diff-no-index-diff-opt-parse:
  diff-no-index: correctly diagnose error return from diff_opt_parse()
diff-no-index.c