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()

Junio C Hamano committed Apr 9, 2014 at 11:59 UTC 693b407077bf3739b3609400845e3f6854830ee4

No changes.