entityMap|blocks|key|epinq|text|我遇到了完全相同的问题，我发现我必须以暴力的方式让它工作。下面是我放在.gitconfig文件中的内容。(请注意，我的meld可执行文件位于不同的位置)|type|unstyled|depth|inlineStyleRanges|entityRanges|data|e5tbn|[merge]
++++tool+=+meld
[mergetool+"meld"]
++++++++cmd+=+"/c/Meld/meld/meld.exe+$PWD/$LOCAL+$PWD/$BASE+$PWD/$REMOTE+--output=$PWD/$MERGED"|code-block|syntax|javascript^0|0^^$0|$]|1|@$2|3|4|5|6|7|8|H|9|@]|A|@]|B|$]]|$2|C|4|D|6|E|8|I|9|@]|A|@]|B|$F|G]]]]

I had the exact same problem and found I had to brute force my way to get it to work.
Here is what I put in my .gitconfig file. (Note my meld executable is in a different location)

<pre><code>[merge]
 tool = meld
[mergetool "meld"]
 cmd = "/c/Meld/meld/meld.exe $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE --output=$PWD/$MERGED"
</code></pre>

entityMap|blocks|key|8jj3j|text|Schuess，注意目录中的空格字符！|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3entn|[merge]
++++tool+=+meld
[mergetool+"meld"]
++++prompt+=+false
++++keepBackup+=+false
++++keepTemporaries+=+false
++++path+=+C:/Program+Files+(x86)/Meld/Meld.exe
++++cmd+=+\"/C/Program+Files+(x86)/Meld/Meld.exe\"+\"$PWD/$LOCAL\"+\"$PWD/$BASE\"+\"$PWD/$REMOTE\"+\"--output=$PWD/$MERGED\"|code-block|syntax|javascript^0|0^^$0|$]|1|@$2|3|4|5|6|7|8|H|9|@]|A|@]|B|$]]|$2|C|4|D|6|E|8|I|9|@]|A|@]|B|$F|G]]]]

Schuess, be careful for space character in directories!

<pre><code>[merge]
 tool = meld
[mergetool "meld"]
 prompt = false
 keepBackup = false
 keepTemporaries = false
 path = C:/Program Files (x86)/Meld/Meld.exe
 cmd = \"/C/Program Files (x86)/Meld/Meld.exe\" \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" \"--output=$PWD/$MERGED\"
</code></pre>

entityMap|blocks|key|d527c|text|我在meld安装程序的bug报告中找到了一个解决方案，位于以下页面：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|ck6o9|https://code.google.com/p/meld-installer/issues/detail?id=11|9ar5r|据我所知，问题是meld.exe程序(通过python解释器运行meld+)不必要地将命令的工作目录设置为meld.exe的工作目录。这会导致在作为命令行参数传递时无法正确解释相对路径。|1sutb|解决方案是将提供的meld.exe替换为通过使用AHK2EXe+(AutoHotKey+script+->+exe)编译meld.ahk文件而生成的file。只需下载页面最下面的脚本，因为那里已经发布了几个版本。^0|0|0|0^^$0|$]|1|@$2|3|4|5|6|7|8|I|9|@]|A|@]|B|$]]|$2|C|4|D|6|7|8|J|9|@]|A|@]|B|$]]|$2|E|4|F|6|7|8|K|9|@]|A|@]|B|$]]|$2|G|4|H|6|7|8|L|9|@]|A|@]|B|$]]]]

I found a solution in a bug report on the meld installer, on this page:

<a href="https://code.google.com/p/meld-installer/issues/detail?id=11" rel="nofollow">https://code.google.com/p/meld-installer/issues/detail?id=11</a>

As far as I understand, the problem is that the meld.exe program (which runs meld through the python interpreter) needlessly sets the command's working directory to that of meld.exe. This causes relative paths to be interpreted incorrectly when passed as command line arguments.

The solution is to replace the provided meld.exe with one generated by compiling the meld.ahk file, using AHK2EXe (AutoHotKey script -> exe). Just download the script furthest down the page, as there have been a few version posted there.

entityMap|blocks|key|fd8o9|text|为什么不在Windows上使用git+bash？|type|unstyled|depth|inlineStyleRanges|entityRanges|data|f539n|安装meld后，只需执行以下操作：|flsfo|git+config+--global+merge.tool+meld
git+config+--global+mergetool.meld.path+"C:\Program+Files+(x86)\Meld\Meld.exe"+<-+path+to+meld+here|code-block|syntax|javascript|6fh4j|这就是全部！^0|0|0|0^^$0|$]|1|@$2|3|4|5|6|7|8|L|9|@]|A|@]|B|$]]|$2|C|4|D|6|7|8|M|9|@]|A|@]|B|$]]|$2|E|4|F|6|G|8|N|9|@]|A|@]|B|$H|I]]|$2|J|4|K|6|7|8|O|9|@]|A|@]|B|$]]]]

Why do you not use git bash for Windows?

After install meld simply:

<pre><code>git config --global merge.tool meld
git config --global mergetool.meld.path "C:\Program Files (x86)\Meld\Meld.exe" &lt;- path to meld here
</code></pre>

Thats all!

entityMap|blocks|key|eau2b|text|我也遇到了类似的issue.Operating系统，使用的是Windows10，下面的更改在me.It上工作，看起来更像是路径问题|type|unstyled|depth|inlineStyleRanges|entityRanges|data|b95pi|git+config+--global+mergetool.meld.path+"/c/Program+Files+(x86)/Meld/Meld.exe"+<-+path+to+meld+here|code-block|syntax|javascript^0|0^^$0|$]|1|@$2|3|4|5|6|7|8|H|9|@]|A|@]|B|$]]|$2|C|4|D|6|E|8|I|9|@]|A|@]|B|$F|G]]]]

I too faced similar issue.Operating system used is Windows 10 and the following changes worked for me.It seems more like path issue

<pre><code>git config --global mergetool.meld.path "/c/Program Files (x86)/Meld/Meld.exe" &lt;- path to meld here
</code></pre>

entityMap|blocks|key|fa9iu|text|在尝试了以上所有方法之后，将Meld设置为以管理员身份运行对我很有效。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|78ci4|右键单击Meld.exe|7sl5i|转到|7eh0r|属性|3tj6s|>|a54fh|兼容性|7g8l0|并选择|2pjtj|复选框|61qi5|我收到的错误引用了临时文件，如|9r5uu|，它们不是正在创建的。提升Meld的权限似乎可以做到这一点，因为它现在对两者都有效|5a0no|并在Meld中手动运行。^0|0|0|0|0|0|0|0|0|0|0^^$0|$]|1|@$2|3|4|5|6|7|8|W|9|@]|A|@]|B|$]]|$2|C|4|D|6|7|8|X|9|@]|A|@]|B|$]]|$2|E|4|F|6|7|8|Y|9|@]|A|@]|B|$]]|$2|G|4|H|6|7|8|Z|9|@]|A|@]|B|$]]|$2|I|4|J|6|7|8|10|9|@]|A|@]|B|$]]|$2|K|4|L|6|7|8|11|9|@]|A|@]|B|$]]|$2|M|4|N|6|7|8|12|9|@]|A|@]|B|$]]|$2|O|4|P|6|7|8|13|9|@]|A|@]|B|$]]|$2|Q|4|R|6|7|8|14|9|@]|A|@]|B|$]]|$2|S|4|T|6|7|8|15|9|@]|A|@]|B|$]]|$2|U|4|V|6|7|8|16|9|@]|A|@]|B|$]]]]

After trying all of the above, setting Meld to run as administrator worked for me.

<ol>
<li>Right-click Meld.exe</li>
<li>Go to Properties > Compatibility and select the <code>Run this program as an administrator</code> checkbox</li>
</ol>

The errors I received referenced temp files like <code>c:\windows\temp\meld-*</code>, which were not being created. Elevating Meld's permissions seems to do the trick as it now works with both <code>git difftool</code> and running manually within Meld.

entityMap|blocks|key|dgcm2|text|没有一个答案对我有效。我在.gitconfig-file中得到了这个：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2d9nq|[merge]
++tool+=+meld
[mergetool+"meld"]
++cmd+=+'C:/Program+Files+(x86)/Meld/Meld.exe'+$LOCAL+$BASE+$REMOTE+--output=$MERGED
[mergetool]
++prompt+=+false|code-block|syntax|javascript|4npcm|在一个|7gkh7|以冲突结束，您只需键入|7qqf7|然后meld打开。在保存之后，您必须在git中提交，冲突就会得到解决。|46tfr|由于某些原因，这只适用于Meld+3.18.x，Meld+3.20.x给了我一个错误。^0|0|0|0|0|0^^$0|$]|1|@$2|3|4|5|6|7|8|P|9|@]|A|@]|B|$]]|$2|C|4|D|6|E|8|Q|9|@]|A|@]|B|$F|G]]|$2|H|4|I|6|7|8|R|9|@]|A|@]|B|$]]|$2|J|4|K|6|7|8|S|9|@]|A|@]|B|$]]|$2|L|4|M|6|7|8|T|9|@]|A|@]|B|$]]|$2|N|4|O|6|7|8|U|9|@]|A|@]|B|$]]]]

None of the answers worked for me. I ended up with this in the .gitconfig-file:

<pre><code>[merge]
 tool = meld
[mergetool "meld"]
 cmd = 'C:/Program Files (x86)/Meld/Meld.exe' $LOCAL $BASE $REMOTE --output=$MERGED
[mergetool]
 prompt = false
</code></pre>

After a <code>git merge mybranch</code> ending with conflicts, you simply type <code>git mergetool</code> and meld opens. After a save, you have to commit in git and the conflicts are resolved. 

For some reason, this only worked with Meld 3.18.x, Meld 3.20.x gives me an error.

entityMap|blocks|key|dok1b|text|由于某些原因，在Windows10中，PATH环境变量在安装过程中无法正确设置，因此会引发奇怪的异常，说明无法在"C:\Program+Files+(X86)/Meld/+.dll“目录下找到某些Meld。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|7p8sh|我的一个变通方法是，在git+bash中执行：|70mdi|export+PATH=$PATH:"/C/Program+Files+(x86)/Meld/lib"|code-block|syntax|javascript|bcrdo|或添加到windows路径|da3rh|C:\Program+Files+(x86)/Meld/bin^0|0|0|0|0^^$0|$]|1|@$2|3|4|5|6|7|8|N|9|@]|A|@]|B|$]]|$2|C|4|D|6|7|8|O|9|@]|A|@]|B|$]]|$2|E|4|F|6|G|8|P|9|@]|A|@]|B|$H|I]]|$2|J|4|K|6|7|8|Q|9|@]|A|@]|B|$]]|$2|L|4|M|6|G|8|R|9|@]|A|@]|B|$H|I]]]]

For some reason, in Windows 10 the PATH environmental variable could not be set properly during the installation, so a strange exception is raised saying that it is not able to find some .dll that are under "C:\Program Files (x86)/Meld/bin" directory. 

A workaround for me was, execute in git bash:

<pre><code>export PATH=$PATH:"/C/Program Files (x86)/Meld/lib" 
</code></pre>

Or add to windows PATH 

<pre><code>C:\Program Files (x86)/Meld/bin
</code></pre>

In Linux, my favorite merge tool is Meld, and I've had no problems using or configuring it to work with Git. However, in Windows it has been a different story.

First, I installed Meld from a bundle I found here: <a href="https://code.google.com/p/meld-installer/" rel="noreferrer">https://code.google.com/p/meld-installer/</a>

Then, I configured my .gitconfig like so to support Meld as the default mergetool

<pre><code>[merge] 
 tool = meld 

[mergetool "meld"] 
 path = C:\\Program Files (x86)\\Meld\\meld\\meld.exe
 keepBackup = false 
 trustExitCode = false
</code></pre>

So, when I have a conflict, I do git difftool and Meld does in fact open. However, the paths to the files that Git writes to pass to the diff tool is incorrect. For example, even though Git generates the BASE, LOCAL, and REMOTE files in the repository directory (the location I called git mergetool from), Meld tries to open each of those files in the directory of the executable. 

Instead of opening C:\repo\roses.txt.LOCAL.2760.txt, Meld tries to open C:\Program Files (x86)\Meld\meld\roses.txt.LOCAL.2760.txt.

Has anyone ran into this before or know how to configure Git / Meld to work correctly in Windows?

Git mergetool with Meld on Windows

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋 

腾讯云代码助手

CODING DevOps

Cloud Studio

SDK中心

API中心

命令行工具

 在Linux中，我最喜欢的合并工具是Meld，我在使用或配置它以使用Git时没有遇到任何问题。然而，在Windows中，情况就不同了。 首先，我从我在这里找到的包中安装了Meld： https://code.google.com/p/meld-installer/ 然后，我将我的.gitconfig配置为支持Meld...

问Windows上带有Meld的Git mergetool
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Windows上带有Meld的Git mergetoolEN