Merge branch 'pr/mergetool'

* pr/mergetool:
  Open external merge tool with original file extensions for all three files

git-mergetool.sh

@@ -152,10 +152,11 @@ merge_file () {
 	exit 1
     fi
 
-    BACKUP="$path.BACKUP.$$"
+    ext="$$$(expr "$path" : '.*\(\.[^/]*\)$')"
-    LOCAL="$path.LOCAL.$$"
+    BACKUP="$path.BACKUP.$ext"
-    REMOTE="$path.REMOTE.$$"
+    LOCAL="$path.LOCAL.$ext"
-    BASE="$path.BASE.$$"
+    REMOTE="$path.REMOTE.$ext"
+    BASE="$path.BASE.$ext"
 
     mv -- "$path" "$BACKUP"
     cp -- "$BACKUP" "$path"