In git config #C:/User/Name/.gitconfig: [user] email = my@email.com name = My Name [core] … [diff] tool = bc3 [difftool] prompt = false [difftool “bc3”] path = C:/Program Files (x86)/Beyond Compare 3/Bcomp.exe trustExitCode = true [merge] tool = bc3 [mergetool] prompt = false keepBackup = false [mergetool “bc3”] path = C:/Program Files (x86)/Beyond Compare 3/Bcomp.exe […]