diff3 merges, pull --rebase, whitespace ignore (mostly)