Macos mercurial kdiff3 mac未打开

我在我的新mac电脑上使用eclipse和mercurial 当我尝试合并时，它会给我一条消息
“1个文件未解析”和kdiff3未打开， kdiff3是默认的合并工具吗？

---

如果没有，我该如何配置它？

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

.hgrc

diff-w

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

其他合并工具 文件合并

.hgrc

diff-w

P4Merge

.hgrc

diff-w

[ui]
merge = macfilemerge

[extensions]
extdiff =

[extdiff]
cmd.difftool = diff-w

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

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

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

opendiff "$@" | cat

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

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