/ git

Configure git using kdiff3 for 3-way merge

git config --global mergetool.kdiff3.cmd 'kdiff3 $BASE $LOCAL $REMOTE -o $MERGED --auto'

```