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

Create zdiff3 ("zealous diff3")-style files

Do not produce file conflicts when common regions have changed; keep the conflict markers in the file and accept that as the merge result.