gitconfig whitespace cleanup
rm autosetupmerge
ediff for git merge