File merging flags
Defaults
Create standard conflicted merge files
Create diff3-style files
Condense non-alphanumeric regions for simplified diff file
Ignore all whitespace
Ignore changes in amount of whitespace
Ignore whitespace at end of line
Use the "patience diff" algorithm
Take extra time to find minimal diff