summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJames Bowes <jbowes@dangerouslyinc.com>2007-03-18 22:11:54 -0400
committerTheodore Ts'o <tytso@mit.edu>2007-03-18 22:13:48 -0400
commit9cec65399d3575774910b21c1cfd762a5e88a245 (patch)
treeea9a9901df003f61123a0dc68980d9200e0f7ecb /git-mergetool.sh
parent7976ce1b909f8d61aa40108f8443e9fe585d15ac (diff)
downloadgit-9cec65399d3575774910b21c1cfd762a5e88a245.tar.gz
mergetool: Add support for vimdiff.
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'git-mergetool.sh')
-rwxr-xr-xgit-mergetool.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 52386a5443..563c5c048f 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -185,9 +185,9 @@ merge_file () {
mv -- "$BACKUP" "$path.orig"
fi
;;
- meld)
+ meld|vimdiff)
touch "$BACKUP"
- meld -- "$LOCAL" "$path" "$REMOTE"
+ $merge_tool -- "$LOCAL" "$path" "$REMOTE"
if test "$path" -nt "$BACKUP" ; then
status=0;
else
@@ -305,6 +305,8 @@ if test -z "$merge_tool" ; then
merge_tool=meld
elif type emacs >/dev/null 2>&1; then
merge_tool=emerge
+ elif type vimdiff >/dev/null 2>&1; then
+ merge_tool=vimdiff
else
echo "No available merge resolution programs available."
exit 1
@@ -312,7 +314,7 @@ if test -z "$merge_tool" ; then
fi
case "$merge_tool" in
- kdiff3|tkdiff|meld|xxdiff)
+ kdiff3|tkdiff|meld|xxdiff|vimdiff)
if ! type "$merge_tool" > /dev/null 2>&1; then
echo "The merge tool $merge_tool is not available"
exit 1