summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@osdl.org>2006-06-28 21:57:12 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-28 22:24:32 -0700
commita9ed376b158faf82d3685b51d546ccaeda716da3 (patch)
treeda7e9ea0736f6b8db3eb5444129a500b20c271e8 /merge-tree.c
parentcheckout -m: fix read-tree invocation (diff)
downloadtgif-a9ed376b158faf82d3685b51d546ccaeda716da3.tar.xz
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>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions