如何在git中使用不同的合并和差异工具? [英] How to use different merge and diff tool in git?

问题描述

我更喜欢使用meld作为差异工具.但是，它没有快速解决所有简单冲突的选项，因此在合并的情况下，我想使用kdiff3

I prefer to use meld as the diff tool. However it doesn't have an option to quickly solve all simple conflicts so in case of merging I'd like to use kdiff3

我已将merge.tool设置为kdiff3，将diff.guitool设置为meld，但git difftool仍然始终运行kdiff3

I've set merge.tool to kdiff3 and diff.guitool to meld but git difftool still always run kdiff3

[merge]
        tool = kdiff3
        conflictstyle = diff3

[diff]
        guitool = meld
        renames = copies
        mnemonicPrefix = true

[difftool]
        prompt = false

如何使git difftool运行meld?

推荐答案

diff.guitool仅在使用--gui标志时适用.

diff.guitool only applies if you use the --gui flag.

设置diff.tool和merge.tool应该使git difftool和git mergetool使用不同的工具:

Setting diff.tool and merge.tool should make git difftool and git mergetool use different tools:

[merge]
        tool = kdiff3

[diff]
        tool = meld

这篇关于如何在git中使用不同的合并和差异工具?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！