Andrew's git / gitweb.git / diff
?
Merge branch 'ap/combine-diff-coalesce-lost'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 00:41:05 +0000 (17:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 00:41:06 +0000 (17:41 -0700)
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

Trivial merge