How to use p4merge as the merge/diff tool for Mercurial?

后端 未结 6 812
忘掉有多难
忘掉有多难 2021-01-30 16:54

Does anyone know how to setup Mercurial to use p4merge as the merge/diff tool on OS X 10.5?

6条回答
  •  无人及你
    2021-01-30 17:23

    I'm guessing there's a CLI tool for p4merge (which I know nothing about).

    I wrote a blog post about using Changes.app, and some other GUI tools with Mercurial: Using Mercurial with GUI Tools.

    Basically, you need to know the calling expectations of the CLI tool that loads up the diff tool. IE, how to make it load data from a particular file, and how to make it wait for exit. There should be enough info on the post to give you some ideas.

提交回复
热议问题