Not working with git mergetool?

[chipbite]

scmpuff seems to be not working with mergetool, I cant get git mergetool 3 to work?

Hi! Thanks for a great timesaver!

I've tried to use the scmpuff numbering for merging, but it seems it does not work.

Am I doing it wrong or shall I try the env variables instead? Any ideas/tips?

BR! /marcus

[mroth]

Hi @chipbite sincere apologies for the delay, I had not been that actively monitoring this repo while dealing with some life issues.

You are correct, mergetool is not currently aliased by scmpuff. The current aliased commands are effectively determined by the shell snippet:

git () {
        case $1 in
                (commit | blame | log | rebase | merge) scmpuff exec -- "$SCMPUFF_GIT_CMD" "$@" ;;
                (checkout | diff | rm | reset | restore) scmpuff exec --relative -- "$SCMPUFF_GIT_CMD" "$@" ;;
                (add) scmpuff exec -- "$SCMPUFF_GIT_CMD" "$@"
                        scmpuff_status ;;
                (*) "$SCMPUFF_GIT_CMD" "$@" ;;
        esac
}

The aliased commands being in the parentheses.

You can use the $e1 etc environmental variables for non-aliased commands.