git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0d2f94a 99d3206)
Merge branch 'ap/combine-diff-coalesce-lost'
authorJunio C Hamano <redacted>
Fri, 12 Apr 2013 00:41:05 +0000 (17:41 -0700)
committerJunio C Hamano <redacted>
Fri, 12 Apr 2013 00:41:06 +0000 (17:41 -0700)
commita15696bb46848b1cc815aae142b9cae562ac1c97
treedd20b3b8b16b70d98e24164243f63b372fa339bbtree | snapshot
parent0d2f94ac9549f5c5db2521bb499d40752d627f1fcommit | diff
parent99d3206010ba1fcc9311cbe8376c0b5e78f4a136commit | diff
Merge branch 'ap/combine-diff-coalesce-lost'

Attempts to minimize "diff -c/--cc" output by coalescing the same
lines removed from the parents better, but with an O(n^2)
complexity.

* ap/combine-diff-coalesce-lost:
  combine-diff: coalesce lost lines optimally
git clone https://git.99rst.org/PROJECT