| Value | Meaning |
|---|---|
| GIT_MERGE_FILE_DEFAULT0 | Defaults |
| GIT_MERGE_FILE_STYLE_MERGE1 << 0 | Create standard conflicted merge files |
| GIT_MERGE_FILE_STYLE_DIFF31 << 1 | Create diff3-style files |
| GIT_MERGE_FILE_SIMPLIFY_ALNUM1 << 2 | Condense non-alphanumeric regions for simplified diff file |
| GIT_MERGE_FILE_IGNORE_WHITESPACE1 << 3 | Ignore all whitespace |
| GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE1 << 4 | Ignore changes in amount of whitespace |
| GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL1 << 5 | Ignore whitespace at end of line |
| GIT_MERGE_FILE_DIFF_PATIENCE1 << 6 | Use the "patience diff" algorithm |
| GIT_MERGE_FILE_DIFF_MINIMAL1 << 7 | Take extra time to find minimal diff |
| GIT_MERGE_FILE_STYLE_ZDIFF31 << 8 | Create zdiff3 ("zealous diff3")-style files |
| GIT_MERGE_FILE_ACCEPT_CONFLICTS1 << 9 | Do not produce file conflicts when common regions have changed; keep the conflict markers in the file and accept that as the merge result. |
File merging flags