diff options
| author | Jeff King <peff@peff.net> | 2016-02-23 01:07:25 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 22:36:09 -0800 |
| commit | 907681e940d095a0ab96756a8cddfd4f63cd71e1 (patch) | |
| tree | 720c3d2f5af7066bff93229b801dc59def61f246 /xdiff/xdiff.h | |
| parent | b779b3a199d9d11e60e522288c84ece5d20dcc2c (diff) | |
| download | git-907681e940d095a0ab96756a8cddfd4f63cd71e1.tar.gz | |
xdiff: drop XDL_EMIT_COMMONjk/no-diff-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>
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index c0339919cc..4fb7e79410 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -42,7 +42,6 @@ extern "C" { #define XDF_IGNORE_BLANK_LINES (1 << 7) #define XDL_EMIT_FUNCNAMES (1 << 0) -#define XDL_EMIT_COMMON (1 << 1) #define XDL_EMIT_FUNCCONTEXT (1 << 2) #define XDL_MMB_READONLY (1 << 0) |