https://bugs.kde.org/show_bug.cgi?id=486782
--- Comment #10 from Sven Moderow <s.mode...@clevermatch.com> ---
git config:
[diff]
tool = vsdiffmerge
colorMoved = zebra
colorMovedWS = allow-indentation-change
[merge]
tool = vsdiffmerge
guitool = vsdiffmerge
colorMoved = zebra
colorMovedWS = allow-indentation-change
conflictstyle = diff3
[difftool]
prompt = true
keepBackup = false
[mergetool]
prompt = true
keepBackup = false
trustExitCode = true
[fetch]
prune = true
[gui]
recentrepo = C:/Source/Repos/xyz
[difftool "vsdiffmerge"]
cmd = \"C:\\Program Files\\Microsoft Visual
Studio\\2022\\Professional\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team
Explorer\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
keepBackup = false
[mergetool "vsdiffmerge"]
cmd = \"C:\\Program Files\\Microsoft Visual
Studio\\2022\\Professional\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team
Explorer\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
keepBackup = false
trustExitCode = true
[difftool "kdiff3"]
cmd = \"C:\\Users\\xyz\\AppData\\Local\\KDiff3\\bin\\kdiff3.exe\"
\"$LOCAL\" \"$REMOTE\"
[mergetool "kdiff3"]
cmd = \"C:\\Users\\xyz\\AppData\\Local\\KDiff3\\bin\\kdiff3.exe\"
\"$BASE\" \"$REMOTE\" \"$LOCAL\" -o \"$MERGED\"
--
You are receiving this mail because:
You are watching all bug changes.
