Usar o Beyond Compare como ferramenta de diff para o Git.
Cygwin e MinGW (Windows)
git config --global diff.tool bc3
git config --global difftool.bc3.trustExitCode true
# Para Cygwin
git config --global difftool.bc3.cmd '"/cygdrive/c/Program Files/Beyond Compare 4/BCompare.exe" `cygpath -w "$LOCAL"` `cygpath -w "$REMOTE"`'
# Para MinGW
git config --global difftool.bc3.cmd '"c:/program files/beyond compare 4/bcomp.exe" "$LOCAL" "$REMOTE"'
Para desativar o prompt “Launch … [Y/n]?”
git config --global difftool.prompt false
Exemplos
git difftool master..minha-branch -- frontend/user/user-list.component.html
git difftool filename.ext
Versões aqui testadas:
- Beyond Compare 4
- Git 2.21.0 / 2.21.0.windows.1
Linux
Em breve