OSDN Git Service

xdiff: drop XDL_EMIT_COMMON
authorJeff King <peff@peff.net>
Tue, 23 Feb 2016 06:07:25 +0000 (01:07 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Feb 2016 06:36:09 +0000 (22:36 -0800)
commit907681e940d095a0ab96756a8cddfd4f63cd71e1
tree720c3d2f5af7066bff93229b801dc59def61f246
parentb779b3a199d9d11e60e522288c84ece5d20dcc2c
xdiff: drop XDL_EMIT_COMMON

There are no more callers that use this mode, and none
likely to be added (as our xdl_merge() eliminates the common
use of it for generating 3-way merge bases).

This is effectively a revert of a9ed376 (xdiff: generate
"anti-diffs" aka what is common to two files, 2006-06-28),
though of course trying to revert that ancient commit
directly produces many textual conflicts.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
xdiff/xdiff.h
xdiff/xemit.c