Better default push behavior
Nicer diffs on merge conflicts