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

后端 未结 6 811
忘掉有多难
忘掉有多难 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:48

    I found Ry4an's answer to be a good solution, except for a minor problem, which left p4merge (under mac os) mixing up the command inputs. Do everything described in his answer and add the following line in the [merge-tools] section:

    p4.args=$base $local $other $output
    

    This line tells mercurial in which order p4merge takes its arguments.

提交回复
热议问题