From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Apr 2013 00:41:05 +0000 (-0700)
Subject: Merge branch 'ap/combine-diff-coalesce-lost'
X-Git-Tag: v1.8.3-rc0~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a15696bb46848b1cc815aae142b9cae562ac1c97;p=thirdparty%2Fgit.git

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

a15696bb46848b1cc815aae142b9cae562ac1c97