@matheusbsbs / matheus-bagliano / commits / 730b5b45fb
Fork 0

[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool

Signed-off-by: Dan McGee <dpmcgee@gmail.com> Acked-by: "Theodore Ts'o" <tytso@mit.edu>

Dan McGee committed Jun 5, 2007 at 21:19 UTC 730b5b45fb8a7751106885d350466c197b671b1c
3 files changed +12 -4
Documentation/config.txt
+1 -1
@@ -531,7 +531,7 @@ merge.summary::
531 merge.tool::
532 Controls which merge resolution program is used by
533 gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff",
534 - "meld", "xxdiff", "emerge", "vimdiff", and "opendiff"
534 + "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".
535
536 merge.verbosity::
537 Controls the amount of output shown by the recursive merge
Documentation/git-mergetool.txt
+1 -1
@@ -25,7 +25,7 @@ OPTIONS
25 -t or --tool=<tool>::
26 Use the merge resolution program specified by <tool>.
27 Valid merge tools are:
28 - kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff
28 + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff
29 +
30 If a merge resolution program is not specified, 'git mergetool'
31 will use the configuration variable merge.tool. If the
git-mergetool.sh
+10 -2
@@ -215,6 +215,12 @@ merge_file () {
215 check_unchanged
216 save_backup
217 ;;
218 + gvimdiff)
219 + touch "$BACKUP"
220 + gvimdiff -f -- "$LOCAL" "$path" "$REMOTE"
221 + check_unchanged
222 + save_backup
223 + ;;
224 xxdiff)
225 touch "$BACKUP"
226 if base_present ; then
@@ -293,7 +299,7 @@ done
299 if test -z "$merge_tool"; then
300 merge_tool=`git-config merge.tool`
301 case "$merge_tool" in
296 - kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | "")
302 + kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | "")
303 ;; # happy
304 *)
305 echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"
@@ -312,6 +318,8 @@ if test -z "$merge_tool" ; then
318 merge_tool=xxdiff
319 elif type meld >/dev/null 2>&1 && test -n "$DISPLAY"; then
320 merge_tool=meld
321 + elif type gvimdiff >/dev/null 2>&1 && test -n "$DISPLAY"; then
322 + merge_tool=gvimdiff
323 elif type opendiff >/dev/null 2>&1; then
324 merge_tool=opendiff
325 elif type emacs >/dev/null 2>&1; then
@@ -325,7 +333,7 @@ if test -z "$merge_tool" ; then
333 fi
334
335 case "$merge_tool" in
328 - kdiff3|tkdiff|meld|xxdiff|vimdiff|opendiff)
336 + kdiff3|tkdiff|meld|xxdiff|vimdiff|gvimdiff|opendiff)
337 if ! type "$merge_tool" > /dev/null 2>&1; then
338 echo "The merge tool $merge_tool is not available"
339 exit 1