diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2017-11-27 11:47:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-28 10:40:04 +0900 |
| commit | 2477ab2ea8651920a9909f6d05b15ad9004a6c64 (patch) | |
| tree | 50a1cc585b71420b1da0230451ef932b114f809b /xdiff/xdiff.h | |
| parent | 5f9953d2c365bffed6f9ee0c6966556bd4d7e2f4 (diff) | |
| download | git-2477ab2ea8651920a9909f6d05b15ad9004a6c64.tar.gz | |
diff: support anchoring line(s)jt/diff-anchored-patience
Teach diff a new algorithm, one that attempts to prevent user-specified
lines from appearing as a deletion or addition in the end result. The
end user can use this by specifying "--anchored=<text>" one or more
times when using Git commands like "diff" and "show".
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xdiff.h')
| -rw-r--r-- | xdiff/xdiff.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 915591f7d4..c1937a2911 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -86,6 +86,10 @@ typedef struct s_mmbuffer { typedef struct s_xpparam { unsigned long flags; + + /* See Documentation/diff-options.txt. */ + char **anchors; + size_t anchors_nr; } xpparam_t; typedef struct s_xdemitcb { |