Git mergetool generates unwanted .orig files

前端 未结 10 2046
予麋鹿
予麋鹿 2020-11-30 16:16

When I do a merge conflict resolution with Kdiff3 (and other merge tool I tried) I noticed that on resolution a *.orig file is created. Is there a way for it to

10条回答
  •  余生分开走
    2020-11-30 16:47

    To be clear, the correct git command is:

    git config --global mergetool.keepBackup false
    

    Both of the other answers have typos in the command line that will cause it to fail or not work correctly.

提交回复
热议问题