Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'pr/mergetool'
author
Junio C Hamano
<gitster@pobox.com>
Sun, 9 Dec 2007 09:01:50 +0000
(
01:01
-0800)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 9 Dec 2007 09:01:50 +0000
(
01:01
-0800)
* pr/mergetool:
Open external merge tool with original file extensions for all three files
git-mergetool.sh
patch
|
blob
|
history
raw
(from parent 1:
9b433e4
)
diff --git
a/git-mergetool.sh
b/git-mergetool.sh
index 5587c5ecea0f6a97f2715636890c9e2f89845d52..2f31fa2417300180662b66afdde11bdf1d6febb2 100755
(executable)
--- a/
git-mergetool.sh
+++ b/
git-mergetool.sh
@@
-152,10
+152,11
@@
merge_file () {
exit 1
fi
- BACKUP="$path.BACKUP.$$"
- LOCAL="$path.LOCAL.$$"
- REMOTE="$path.REMOTE.$$"
- BASE="$path.BASE.$$"
+ ext="$$$(expr "$path" : '.*\(\.[^/]*\)$')"
+ BACKUP="$path.BACKUP.$ext"
+ LOCAL="$path.LOCAL.$ext"
+ REMOTE="$path.REMOTE.$ext"
+ BASE="$path.BASE.$ext"
mv -- "$path" "$BACKUP"
cp -- "$BACKUP" "$path"