stormoz · January 18, 2016 02:15
diff --git a/configure kdiff tree b/configure kdiff tree
 #from http://stackoverflow.com/questions/6412516/configuring-diff-tool-with-gitconfig

 [difftool "kdiff3"]
    path = C:/Progra~1/KDiff3/kdiff3.exe
    trustExitCode = false  
 [difftool]
    prompt = false 
 [diff]
    tool = kdiff3 
 [mergetool "kdiff3"]
    path = C:/Progra~1/KDiff3/kdiff3.exe
    trustExitCode = false 
 [mergetool]
    keepBackup = false 
 [merge]
    tool = kdiff3
	#from http://stackoverflow.com/questions/6412516/configuring-diff-tool-with-gitconfig

	[difftool "kdiff3"]
	path = C:/Progra~1/KDiff3/kdiff3.exe
	trustExitCode = false
	[difftool]
	prompt = false
	[diff]
	tool = kdiff3
	[mergetool "kdiff3"]
	path = C:/Progra~1/KDiff3/kdiff3.exe
	trustExitCode = false
	[mergetool]
	keepBackup = false
	[merge]
	tool = kdiff3