chezmoi_dotfiles/.gitconfig

14 lines
268 B
INI

[diff]
tool = ediff
guitool = ediff
[difftool "ediff"]
cmd = /PATH/TO/ediff.sh $LOCAL $REMOTE $MERGED
[merge]
tool = ediff
[mergetool "ediff"]
cmd = /PATH/TO/ediff.sh $LOCAL $REMOTE $MERGED $BASE
trustExitCode = true