Git mergetool generates unwanted .orig files

前端 未结 10 2016
予麋鹿
予麋鹿 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:25

    git config --global mergetool.keepBackup false
    

    This should work for Beyond Compare (as mergetool) too

提交回复
热议问题