Get Merge Abort and Conflict Style

git config --global merge.conflictstyle diff3
git merge --abort

Thanks Chris Angelico

Remote deleting files over ssh. Cool.