Code

xdiff: generate "anti-diffs" aka what is common to two files
authorLinus Torvalds <torvalds@osdl.org>
Thu, 29 Jun 2006 04:57:12 +0000 (21:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 29 Jun 2006 05:24:32 +0000 (22:24 -0700)
commita9ed376b158faf82d3685b51d546ccaeda716da3
treeda7e9ea0736f6b8db3eb5444129a500b20c271e8
parentabc02670169cee9541793a86324a014272ca8ed5
xdiff: generate "anti-diffs" aka what is common to two files

This fairly trivial patch adds a new XDL_EMIT_xxx flag to tell libxdiff
that we don't want to generate the _diff_ between two files, we want to
see the lines that are _common_ to two files.

So when you set XDL_EMIT_COMMON, xdl_diff() will do everything exactly
like it used to do, but the output records it generates just contain the
lines that aren't part of the diff.

This is for doing things like generating the common base case for a file
that was added in both branches.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
xdiff/xdiff.h
xdiff/xemit.c