替换diff
setp 1 : Ubuntu install meld
sudo apt install meld
step 2 : create a shell script named git_meld.sh
sudo nano /bin/git-meld.sh
#!/bin/sh
meld $2 $5
step 3 : chang git_meld.sh permissions
sudo chmod +x /bin/git-meld.sh
step 4 : config git diff tool
git config --local diff.external /bin/git-meld.sh
or
git config --global diff.external /bin/git-meld.sh
替换mergetool
step 1 :
git config --local merge.tool meld
or
git config --global merge.tool meld