summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-03 12:38:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-03 12:38:42 -0700
commit7b6bc4d8350029fed82824a33ea9039f22788eec (patch)
treecfa3c083958735e0f1b64809aa71db7b24d694ef /builtin
parentMerge branch 'cb/aix' (diff)
parentdiff-no-index: correctly diagnose error return from diff_opt_parse() (diff)
downloadtgif-7b6bc4d8350029fed82824a33ea9039f22788eec.tar.xz
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 'builtin')
0 files changed, 0 insertions, 0 deletions