tools

        
bash
        

            
        
     
# diff
git config --global diff.tool bc3
# merge
git config --global merge.tool bc3
git config --global mergetool.bc3.trustExitCode true

Software#

• Beyond Compare
• Snagit

Diagrams#

• draw.io
• plantuml
• C4-PlantUML

Inside ~/.gitconfig:

        
ini
        

            
        
     
[diff]
        tool = bcomp
[difftool]
        prompt = false
[difftool "bcomp"]
        path = "/mnt/c/Program\\ Files/Beyond\\ Compare\\ 4/BCompare.exe"
        cmd = "/mnt/c/Program\\ Files/Beyond\\ Compare\\ 4/BCompare.exe" "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)"
[merge]
        tool = bcomp
[mergetool]
        prompt = false
[mergetool "bcomp"]
        path = "/mnt/c/Program\\ Files/Beyond\\ Compare\\ 4/BCompare.exe"
        cmd = "/mnt/c/Program\\ Files/Beyond\\ Compare\\ 4/BCompare.exe" "$(wslpath -aw $LOCAL)" "$(wslpath -aw $REMOTE)" "$(wslpath -aw $BASE)" "$(wslpath -aw $MERGED)"