Color and VIM as merge tool
Explicit Python shiftwidth
push.default=simple