@matheusbsbs / matheus-bagliano / commits / 365cf979c4
Fork 0

mergetool: Add support for Apple Mac OS X's opendiff command

Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Theodore Ts'o committed Mar 29, 2007 at 10:03 UTC 365cf979c48a52eec65f29a02a973753418396f4
1 file changed +14 -2
git-mergetool.sh
+14 -2
@@ -230,6 +230,16 @@ merge_file () {
230 check_unchanged
231 save_backup
232 ;;
233 + opendiff)
234 + touch "$BACKUP"
235 + if base_present; then
236 + opendiff "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$path" | cat
237 + else
238 + opendiff "$LOCAL" "$REMOTE" -merge "$path" | cat
239 + fi
240 + check_unchanged
241 + save_backup
242 + ;;
243 emerge)
244 if base_present ; then
245 emacs -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "$path"
@@ -280,7 +290,7 @@ done
290 if test -z "$merge_tool"; then
291 merge_tool=`git-config merge.tool`
292 case "$merge_tool" in
283 - kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff | "")
293 + kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | "")
294 ;; # happy
295 *)
296 echo >&2 "git config option merge.tool set to unknown tool: $merge_tool"
@@ -299,6 +309,8 @@ if test -z "$merge_tool" ; then
309 merge_tool=xxdiff
310 elif type meld >/dev/null 2>&1 && test -n "$DISPLAY"; then
311 merge_tool=meld
312 + elif type opendiff >/dev/null 2>&1; then
313 + merge_tool=opendiff
314 elif type emacs >/dev/null 2>&1; then
315 merge_tool=emerge
316 elif type vimdiff >/dev/null 2>&1; then
@@ -310,7 +322,7 @@ if test -z "$merge_tool" ; then
322 fi
323
324 case "$merge_tool" in
313 - kdiff3|tkdiff|meld|xxdiff|vimdiff)
325 + kdiff3|tkdiff|meld|xxdiff|vimdiff|opendiff)
326 if ! type "$merge_tool" > /dev/null 2>&1; then
327 echo "The merge tool $merge_tool is not available"
328 exit 1