projects
/
git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0d2f94a
99d3206
)
Merge branch 'ap/combine-diff-coalesce-lost'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 12 Apr 2013 00:41:05 +0000
(17:41 -0700)
committer
Junio 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