diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-19 22:33:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-19 22:33:56 +0300 |
| commit | d7c6c2369ac21141b7c6cceaebc6414ec3da14ad (patch) | |
| tree | 9aa0b15668a5bffa1f05e766eebab1d3cbafb380 /xdiff/xdiff.h | |
| parent | 6d2c4619a59d53325e6de2265205c407767bde9d (diff) | |
| parent | 2477ab2ea8651920a9909f6d05b15ad9004a6c64 (diff) | |
Merge branch 'jt/diff-anchored-patience'
"git diff" learned a variant of the "--patience" algorithm, to
which the user can specify which 'unique' line to be used as
anchoring points.
* jt/diff-anchored-patience:
diff: support anchoring line(s)
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 { |