mercurial kdiff3 mac没有开通

Question

我在我的新Mac和my上使用了与mercurial的eclipse 当我试图合并它给我一个消息
“1个文件未解析”和kdiff3没有打开， kdiff3是默认的合并工具吗？ 如果不能如何配置？

Answer 1

我不确定Eclipse是否会切入，但对于Mercurial本身而言，默认合并工具是其内部合并。对于kdiff3，这似乎对我有用：

.hgrc

[ui]
merge = macfilemerge

[extensions]
extdiff =

[extdiff]
cmd.difftool = diff-w

[merge-tools]
macfilemerge.executable = diff-w
macfilemerge.args = $base $local $other -o $output

DIFF-W

# Piping the output makes the script to wait for diff tool's output
/Applications/kdiff3.app/Contents/MacOS/kdiff3 "$@" | cat

请记住chmod + x你的 diff-w 并将它放在你的公共路径中。

其他合并工具

<强> Filemerge

.hgrc

[merge-tools]
macfilemerge.args = $local $other -ancestor $base -merge $output

DIFF-W

opendiff "$@" | cat

<强> P4Merge

.hgrc

[merge-tools]
macfilemerge.args = $base $local $other $output

DIFF-W

/Applications/p4merge.app/Contents/MacOS/p4merge "$@" | cat