scripts
/
automate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
automate/020_git-mergetool.sh

4 lines
97 B
Bash
Raw Blame History

git config merge.tool meld
#git config merge.tool gvimdiff3
git config merge.conflictstyle diff3
Reference in New Issue View Git Blame Copy Permalink