2016-01-13 107 views
0
$ 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作爲安裝在Linux上的git的合併/比較工具

問題我可以用winmerge做兩次提交的比較(即9c88fb7 9c3da6c)嗎?

回答

相關問題