libgit2

git_merge_file_flag_t

Version:

File merging flags

Values

GIT_MERGE_FILE_DEFAULT
0

Defaults

GIT_MERGE_FILE_STYLE_MERGE
(1 << 0)

Create standard conflicted merge files

GIT_MERGE_FILE_STYLE_DIFF3
(1 << 1)

Create diff3-style files

GIT_MERGE_FILE_SIMPLIFY_ALNUM
(1 << 2)

Condense non-alphanumeric regions for simplified diff file

GIT_MERGE_FILE_IGNORE_WHITESPACE
(1 << 3)

Ignore all whitespace

GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE
(1 << 4)

Ignore changes in amount of whitespace

GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL
(1 << 5)

Ignore whitespace at end of line

GIT_MERGE_FILE_DIFF_PATIENCE
(1 << 6)

Use the "patience diff" algorithm

GIT_MERGE_FILE_DIFF_MINIMAL
(1 << 7)

Take extra time to find minimal diff

Versions