fixing git merge editor on both linux and mac