diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-01-31 09:28:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-31 09:28:43 -0800 |
| commit | 9d8510b3bec46a1de7f598a5ab8305be54800b04 (patch) | |
| tree | db7d3fe5afae75f9b4f59fe1550fc284c10a859e /include/git2 | |
| parent | cdab165df44baf3464ae1e5ddff6d04a65e02304 (diff) | |
| parent | db39807c8957d88593632f75f8e5e8661a646ee5 (diff) | |
| download | libgit2-9d8510b3bec46a1de7f598a5ab8305be54800b04.tar.gz | |
Merge pull request #4488 from libgit2/ethomson/conflict_marker_size
Use longer conflict markers in recursive merge base
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/merge.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 94ac8b5c5..80ef864d1 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -162,6 +162,8 @@ typedef enum { GIT_MERGE_FILE_DIFF_MINIMAL = (1 << 7), } git_merge_file_flag_t; +#define GIT_MERGE_CONFLICT_MARKER_SIZE 7 + /** * Options for merging a file */ @@ -191,6 +193,10 @@ typedef struct { /** see `git_merge_file_flag_t` above */ git_merge_file_flag_t flags; + + /** The size of conflict markers (eg, "<<<<<<<"). Default is + * GIT_MERGE_CONFLICT_MARKER_SIZE. */ + unsigned short marker_size; } git_merge_file_options; #define GIT_MERGE_FILE_OPTIONS_VERSION 1 |