It didn’t give an error message, it just defaulted to dump on the terminal Difference.
I have followed the common guide to learn how to configure it, but to no avail:
>Created an executable script:
#!/bin/sh
/usr/bin/opendiff "$2" "$5" -merge "$1"
>Added options for .gitconfig:
external = ~/git-diff-cmd.sh
tool = opendiff
But it does not work.
Actually, FileMerge is in It is automatically recognized and started without using this script and configuration, just execute git difftool -t opendiff {filename}.
export GIT_EXTERNAL_DIFF=
I used opendiff and git as difftool on Mac OS X, and it stopped working today.
It didn’t give an error message, it just defaulted to dump the diff on the terminal.
I have followed the common guide to learn how to configure it, but to no avail:
>Created an executable script:
#! /bin/sh
/usr/bin/opendiff "$2" "$5" -merge "$1"
>Added options for .gitconfig:
external = ~/git-diff-cmd.sh
tool = opendiff
But it does not work.
Actually, FileMerge does not use this script and configuration If it is automatically recognized and started, you only need to execute git difftool -t opendiff (fi lename).
Try to set environment variables
export GIT_EXTERNAL_DIFF=