| commit | c3d51cd16a8db417b89608a37410cf3bf8a5b137 | |
| author | Pini Reznik <pinir@expand.com> | |
| Wed, 5 Dec 2007 07:19:13 +0000 (5 09:19 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Dec 2007 02:43:20 +0000 (5 18:43 -0800) | ||
| tree | 16e7e38e654ab729ef4cf70595144ded07b7eddf | treesnapshot (tar.gz zip) |
| parent | cec99d8cef12d18c71b277a4cd6963d37b13e901 | commitdiff |
Open external merge tool with original file extensions for all three files
Before this change, conflicted files were open in external merge tool with
temporary filenames like REMOTE.$$ and LOCAL.$$. This way meld was unable
to recognize these files and syntax highlighting feature was unusable.
Help such merge tools by giving temporar files the same extension as the
original.
Signed-off-by: Pini Reznik <pinir@expand.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Before this change, conflicted files were open in external merge tool with
temporary filenames like REMOTE.$$ and LOCAL.$$. This way meld was unable
to recognize these files and syntax highlighting feature was unusable.
Help such merge tools by giving temporar files the same extension as the
original.
Signed-off-by: Pini Reznik <pinir@expand.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool.sh | diffblobblamehistory |