diff options
| author |  Pini Reznik <pinir@expand.com> | 2007-12-05 09:19:13 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-12-05 18:43:20 -0800 |
| commit | c3d51cd16a8db417b89608a37410cf3bf8a5b137 (patch) | |
| tree | 16e7e38e654ab729ef4cf70595144ded07b7eddf /git-merge-one-file.sh | |
| parent | Documentation: color.* = true means "auto" (diff) | |
| download | tgif-c3d51cd16a8db417b89608a37410cf3bf8a5b137.tar.xz | |
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>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions