diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2015-03-12 13:16:09 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2015-03-16 09:53:27 +0200 |
| commit | 74c37c2a48756299306bb10e9e546c1627ca289f (patch) | |
| tree | 33754c0585b084657059fd9cbac98e0920119cd5 /include | |
| parent | 13de93631664cd6eec3afedabb7145d5562a3e01 (diff) | |
| download | libgit2-74c37c2a48756299306bb10e9e546c1627ca289f.tar.gz | |
Added options to enable patience and minimal diff drivers
Diffstat (limited to 'include')
| -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; /** |