summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-05 15:06:26 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-05 15:06:26 -0800
commit6376463c37e0371a411013b90b2e8fc0f7d27dfa (patch)
treed2f08dd76391e6afad72a825bbd072ef53683281 /.gitignore
parentMerge branch 'nd/http-fetch-shallow-fix' (diff)
parenttests: add checking that combine-diff emits only correct paths (diff)
downloadtgif-6376463c37e0371a411013b90b2e8fc0f7d27dfa.tar.xz
Merge branch 'ks/combine-diff'
Teach combine-diff to honour the path-output-order imposed by diffcore-order, and optimize how matching paths are found in the N-way diffs made with parents. * ks/combine-diff: tests: add checking that combine-diff emits only correct paths combine-diff: simplify intersect_paths() further combine-diff: combine_diff_path.len is not needed anymore combine-diff: optimize combine_diff_path sets intersection diff test: add tests for combine-diff with orderfile diffcore-order: export generic ordering interface
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions