{"thread":{"id":"11157","subject":"[PATCH] Open external merge tool with original file extensions for all three files","startedAt":"2007-12-06T07:06:59Z","lastAt":"2007-12-06T07:06:59Z","messageCount":1,"participants":["Pini Reznik"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"62123","messageId":"1196924819-4007-1-git-send-email-pinir@expand.com","threadId":"11157","inReplyTo":null,"subject":"[PATCH] Open external merge tool with original file extensions for all three files","fromName":"Pini Reznik","fromEmail":"pinir@expand.com","sentAt":"2007-12-06T07:06:59Z","receivedAt":"2007-12-06T07:06:59Z","isPatch":true,"sender":{"key":"pinir@expand.com","avatar":null},"body":"Before this fix conflicted files were open in external merge\ntool with temporal extensions like REMOTE.$$ and LOCAL.$$.\nThis way meld was unable to recognize these files and\nsyntax highlighting feature was unusable.\n\nSigned-off-by: Pini Reznik <pinir@expand.com>\n---\n git-mergetool.sh |    9 +++++----\n 1 files changed, 5 insertions(+), 4 deletions(-)\n\ndiff --git a/git-mergetool.sh b/git-mergetool.sh\nindex 5587c5e..2f31fa2 100755\n--- a/git-mergetool.sh\n+++ b/git-mergetool.sh\n@@ -152,10 +152,11 @@ merge_file () {\n \texit 1\n     fi\n \n-    BACKUP=\"$path.BACKUP.$$\"\n-    LOCAL=\"$path.LOCAL.$$\"\n-    REMOTE=\"$path.REMOTE.$$\"\n-    BASE=\"$path.BASE.$$\"\n+    ext=\"$$$(expr \"$path\" : '.*\\(\\.[^/]*\\)$')\"\n+    BACKUP=\"$path.BACKUP.$ext\"\n+    LOCAL=\"$path.LOCAL.$ext\"\n+    REMOTE=\"$path.REMOTE.$ext\"\n+    BASE=\"$path.BASE.$ext\"\n \n     mv -- \"$path\" \"$BACKUP\"\n     cp -- \"$BACKUP\" \"$path\"\n-- \n1.5.3.5\n"}]}