diff options
Diffstat (limited to 'include/git2/merge.h')
| -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 e971f2d40..d3360a7e0 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -134,6 +134,12 @@ typedef enum { /** Ignore whitespace at end of line */ GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL = (1 << 5), + + /** Use the "patience diff" algorithm */ + GIT_MERGE_FILE_DIFF_PATIENCE = (1 << 6), + + /** Take extra time to find minimal diff */ + GIT_MERGE_FILE_DIFF_MINIMAL = (1 << 7), } git_merge_file_flags_t; /** |