diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-11 17:41:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-11 17:41:06 -0700 |
| commit | a15696bb46848b1cc815aae142b9cae562ac1c97 (patch) | |
| tree | dd20b3b8b16b70d98e24164243f63b372fa339bb /t/t7110-reset-merge.sh | |
| parent | Merge branch 'sr/log-SG-no-textconv' (diff) | |
| parent | combine-diff: coalesce lost lines optimally (diff) | |
| download | tgif-a15696bb46848b1cc815aae142b9cae562ac1c97.tar.xz | |
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
Diffstat (limited to 't/t7110-reset-merge.sh')
0 files changed, 0 insertions, 0 deletions