Using ediff as git mergetool

前端 未结 12 502
天命终不由人
天命终不由人 2020-12-12 10:22

I would like to be able to use ediff with \"git mergetool\".

I found some patches that alter the source code, which I don\'t want to do. Instead, I\'d like to add ed

12条回答
  •  既然无缘
    2020-12-12 11:25

    For using Subversion's interactive merge tool instead of git see this post for some instructions to set this up.

提交回复
热议问题