undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pr/mergetool'

Browse Source 
* pr/mergetool:
  Open external merge tool with original file extensions for all three files
This commit is contained in:
Junio C Hamano 2007-12-09 01:01:50 -08:00
commit 05e74f4111
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-mergetool.sh
View File

@ -152,10 +152,11 @@ merge_file () {
exit 1 exit 1
fi 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" mv -- "$path" "$BACKUP"
cp -- "$BACKUP" "$path" cp -- "$BACKUP" "$path"