Get Merge Abort and Conflict Style March 9, 2018 By Mike iLL Kilmer git config --global merge.conflictstyle diff3 git merge --abort Thanks Chris Angelico Remote deleting files over ssh. Cool.