Kdiff3 won't open with mergetool command

后端 未结 5 1973
我在风中等你
我在风中等你 2021-02-07 01:26

I have conflicts, so I type:

git mergetool

I then get a message saying:

Hit return to start merge resolution tool

5条回答
  •  独厮守ぢ
    2021-02-07 01:47

    Yet another answer for future Googlers:

    Actually, no external merge tool will start. An issue was filed in August 2015: https://jira.atlassian.com/browse/SRCTREEWIN-3543

提交回复
热议问题