merge-wrapper for UnityYAMLMerge

merge-wrapper

#!/bin/bash
# Wrapper script for git mergetool
# This requires the .gitconfig file to have:
#  - mergetool entry for "unityyamlmerge";
#  - mergetool entry for "p4mergetool";
# These merge tool entries must both specify the
# cmd field. The command to call this script:
# [mergetool "merge_wrapper"]
#       cmd = $HOME/merge-wrapper \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
# Locate this script in your $HOME

BASE=$1
LOCAL=$2
REMOTE=$3
MERGED=$4

UNITY_EXT="\.unity"

if echo "$BASE" | grep -q "$UNITY_EXT"; then
        echo "Using merge tool for unity file";
        CMD=$(git config mergetool.unityyamlmerge.cmd)
        eval $CMD
else
#checking for additional special merge tool cases
#Finally, the default case:
        echo "Using default merge tool";
        CMD=$(git config mergetool.p4mergetool.cmd)
        eval $CMD
fi