diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2022-01-29 21:02:15 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2022-01-30 09:27:29 -0500 |
| commit | c629d2a11cbc5863c4a68eaafa8bf6a99b263f26 (patch) | |
| tree | 9d1bb823eb679ab9ce49eff5ed6b47764de46ff6 /include/git2/merge.h | |
| parent | 1458fb56efad36a5d231793b63b466d5a07a5488 (diff) | |
| download | libgit2-c629d2a11cbc5863c4a68eaafa8bf6a99b263f26.tar.gz | |
merge: support zdiff3 conflict styles
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 3b3132f26..edd090cff 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -159,7 +159,10 @@ typedef enum { GIT_MERGE_FILE_DIFF_PATIENCE = (1 << 6), /** Take extra time to find minimal diff */ - GIT_MERGE_FILE_DIFF_MINIMAL = (1 << 7) + GIT_MERGE_FILE_DIFF_MINIMAL = (1 << 7), + + /** Create zdiff3 ("zealous diff3")-style files */ + GIT_MERGE_FILE_STYLE_ZDIFF3 = (1 << 8) } git_merge_file_flag_t; #define GIT_MERGE_CONFLICT_MARKER_SIZE 7 |