diff options
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 387197a40..e971f2d40 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -111,23 +111,6 @@ typedef enum { } git_merge_file_favor_t; /** - * Whitespace merging flags - */ -typedef enum { - /** Defaults */ - GIT_MERGE_FILE_IGNORE_DEFAULT = 0, - - /** Ignore all whitespace */ - GIT_MERGE_FILE_IGNORE_WHITESPACE = (1 << 0), - - /** Ignore changes in amount of whitespace */ - GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE = (1 << 1), - - /** Ignore whitespace at end of line */ - GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL = (1 << 2), -} git_merge_file_whitespace_t; - -/** * File merging flags */ typedef enum { @@ -142,6 +125,15 @@ typedef enum { /** Condense non-alphanumeric regions for simplified diff file */ GIT_MERGE_FILE_SIMPLIFY_ALNUM = (1 << 2), + + /** Ignore all whitespace */ + GIT_MERGE_FILE_IGNORE_WHITESPACE = (1 << 3), + + /** Ignore changes in amount of whitespace */ + GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE = (1 << 4), + + /** Ignore whitespace at end of line */ + GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL = (1 << 5), } git_merge_file_flags_t; /** @@ -172,10 +164,7 @@ typedef struct { git_merge_file_favor_t favor; /** Merge file flags. */ - git_merge_file_flags_t flags; - - /** Whitespace merge flags */ - unsigned int whitespace_flags; + unsigned int flags; } git_merge_file_options; #define GIT_MERGE_FILE_OPTIONS_VERSION 1 @@ -251,8 +240,7 @@ typedef struct { /** Flags for handling conflicting content. */ git_merge_file_favor_t file_favor; - /** Flags for handling whitespace */ - unsigned int whitespace_flags; + unsigned int file_flags; } git_merge_options; #define GIT_MERGE_OPTIONS_VERSION 1 |