diff options
| author | James Bowes <jbowes@dangerouslyinc.com> | 2007-03-19 02:11:54 (GMT) |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-03-19 02:13:48 (GMT) |
| commit | 9cec65399d3575774910b21c1cfd762a5e88a245 (patch) | |
| tree | ea9a9901df003f61123a0dc68980d9200e0f7ecb /git-mergetool.sh | |
| parent | 7976ce1b909f8d61aa40108f8443e9fe585d15ac (diff) | |
| download | git-9cec65399d3575774910b21c1cfd762a5e88a245.zip git-9cec65399d3575774910b21c1cfd762a5e88a245.tar.gz git-9cec65399d3575774910b21c1cfd762a5e88a245.tar.bz2 | |
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-x | git-mergetool.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 52386a5..563c5c0 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 |