git - 如何使用 winmerge 作为 Linux 上安装的 git 的合并/差异工具

Question

$ cd testGit/
$ ls
first.txt  second.txt
$ git log --oneline
9c88fb7 add second lines to 1st & 2nd files
9c3da6c add 1st & 2nd files

$ git diff 9c88fb7 9c3da6c first.txt
warning: LF will be replaced by CRLF in first.txt.
The file will have its original line endings in your working directory.
diff --git a/first.txt b/first.txt
index 4a0143f..9c59e24 100644
--- a/first.txt
+++ b/first.txt
@@ -1,2 +1 @@
 first
-first2

$ git difftool HEAD HEAD~1
/git/2.5.3/git-core/mergetools/winmerge: line 124: /c/Program Files (x86)/WinMerge/WinMergeU.exe: No such file or directory
/git/2.5.3/git-core/mergetools/winmerge: line 124: /c/Program Files (x86)/WinMerge/WinMergeU.exe: No such file or directory

我已将 redhat 驱动器安装到 Z:/testGit/。

问题我可以使用 winmerge 对两个提交（即 9c88fb7 9c3da6c）进行比较吗？

Answer 1

WinMerge 是为 Windows 开发的。

从他们的网站：

WinMerge 是一个适用于 Windows 的开源差异和合并工具。

还：

支持微软视窗 2000/XP/2003/Vista/2008/7/8/2012

这是一个链接到 Linux 的替代差异工具的站点： http ://www.linuxalt.com/linux-alternatives-to/windows/winmerge.html