Defaults

Create standard conflicted merge files

Create diff3-style files

Condense non-alphanumeric regions for simplified diff file