Change diff colors. Added autosetuprebase=always.