mercurial kdiff3 mac不开放

Question

我在我的新mac上使用带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

迪夫-w

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

记得把它放在你的共同道路上。

其他合并工具

过滤

.hgrc

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

迪夫-w

opendiff "$@" | cat

P4Merge

.hgrc

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

迪夫-w

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