(- git) Using diff3 merge-style for git conflicts