1

PowerShell hangs after calling git mergetool and does not move on.

enter image description here

My global git config file

[user]
    name = scrubbed
    email = scrubbed@a.com
[credential]
    helper = manager
[diff]
    tool = kdiff3
[difftool "kdiff3"]
    path = c:/Program Files/KDiff3/kdiff3.exe
[merge]
    tool = kdiff3
[mergetool "kdiff3"]
    path = c:/Program Files/KDiff3/kdiff3.exe
theB3RV
  • 894
  • 4
  • 13
  • 33

0 Answers0