发表新帖
发表新帖

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

后端 未结
关注
6 877
忘掉有多难
忘掉有多难 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:27

    I am using version 1.0.1 of TortoiseHg and p4merge works out of the box.

    Just go to Global Settings -> TortoiseHg and select the following options:

    • Three-way Merge Tool: p4merge
    • Visual Diff Tool: p4merge

    Screenshot

    0 讨论(0)
 看不清?
提交回复
热议问题