From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Mar 2014 23:06:26 +0000 (-0800)
Subject: Merge branch 'ks/combine-diff'
X-Git-Tag: v2.0.0-rc0~146
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=6376463c37e0371a411013b90b2e8fc0f7d27dfa;p=git.git

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

6376463c37e0371a411013b90b2e8fc0f7d27dfa