summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-12 11:38:14 -0800
committerJunio C Hamano <gitster@pobox.com>2015-01-12 11:38:19 -0800
commit42618bc34ee45d1f2ac3c68c8d63e12b83ab563a (patch)
treeabd4d25e288e9068d6ea1e153cc4e29c220adc63 /ll-merge.h
parent1e6f5b22ad318446500fbd3b94b733eddd5b6414 (diff)
parent07913d5ae15d7f583a506ce991a6b88761e600e2 (diff)
downloadgit-42618bc34ee45d1f2ac3c68c8d63e12b83ab563a.tar.gz
Merge branch 'cc/bisect-rev-parsing'
The logic in "git bisect bad HEAD" etc. to avoid forcing the test of the common ancestor of bad and good commits was broken. * cc/bisect-rev-parsing: bisect: add test to check that revs are properly parsed bisect: parse revs before passing them to check_expected_revs()
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions