| commit | a15696bb46848b1cc815aae142b9cae562ac1c97 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Apr 2013 00:41:05 +0000 (11 17:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Apr 2013 00:41:06 +0000 (11 17:41 -0700) | ||
| tree | dd20b3b8b16b70d98e24164243f63b372fa339bb | treesnapshot (tar.gz zip) |
| parent | 0d2f94ac9549f5c5db2521bb499d40752d627f1f | commitdiff |
| parent | 99d3206010ba1fcc9311cbe8376c0b5e78f4a136 | commitdiff |
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
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