From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Apr 2014 18:59:16 +0000 (-0700)
Subject: Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maint
X-Git-Tag: v1.9.2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=693b407077bf3739b3609400845e3f6854830ee4;p=thirdparty%2Fgit.git

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

693b407077bf3739b3609400845e3f6854830ee4