summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2009-01-07 18:04:09 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-07 13:35:44 -0800
commit92b7de93fb7801570ddc3195f03f30b9c201a3bd (patch)
treee7113b428c97f3e6b107f1d64c74f343eda7ecf9 /merge-recursive.h
parentGIT 1.6.1 (diff)
downloadtgif-92b7de93fb7801570ddc3195f03f30b9c201a3bd.tar.xz
Implement the patience diff algorithm
The patience diff algorithm produces slightly more intuitive output than the classic Myers algorithm, as it does not try to minimize the number of +/- lines first, but tries to preserve the lines that are unique. To this end, it first determines lines that are unique in both files, then the maximal sequence which preserves the order (relative to both files) is extracted. Starting from this initial set of common lines, the rest of the lines is handled recursively, with Myers' algorithm as a fallback when the patience algorithm fails (due to no common unique lines). This patch includes memory leak fixes by Pierre Habouzit. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions