diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-04-03 12:38:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 12:38:42 -0700 |
commit | 7b6bc4d8350029fed82824a33ea9039f22788eec (patch) | |
tree | cfa3c083958735e0f1b64809aa71db7b24d694ef /refs.c | |
parent | 8ba87adad637b402fb309754e213ec40b74e4f18 (diff) | |
parent | ad1c3fbd26d0aae50abfb3c7d654f7229ba9370d (diff) | |
download | git-7b6bc4d8350029fed82824a33ea9039f22788eec.tar.gz |
Merge branch 'jc/fix-diff-no-index-diff-opt-parse'
"diff --no-index -Mq a b" fell into an infinite loop.
* jc/fix-diff-no-index-diff-opt-parse:
diff-no-index: correctly diagnose error return from diff_opt_parse()
Diffstat (limited to 'refs.c')
0 files changed, 0 insertions, 0 deletions