2017 10 19 17 23 [git] 讓git可以使用araxis merge

在.gifconfig檔案加入以下文字:

[diff]
	tool = araxis
[difftool "araxis"]
	path = C:\\Program Files\\Araxis\\Araxis Merge\\compare.exe

[merge]
	tool = araxis
[mergetool "araxis"]
	path = C:\\Program Files\\Araxis\\Araxis Merge\\compare.exe

然後再設定一下alias,

$ git config --global alias.gdiff "difftool --tool=araxis -y"

就可以直接在commandline下使用.

$ git gdiff test.c