From ee4700cc7563b2e2da6a21b6edef3f5786e2c56a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= <cyplo@cyplo.net>
Date: Tue, 12 Jul 2016 15:35:12 +0200
Subject: [PATCH] Added P4Merge and WinMerge as git diff tools on cygwin

---
 .gitconfig_includes.cygwin | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitconfig_includes.cygwin b/.gitconfig_includes.cygwin
index cb3e6e39..2aa43a69 100644
--- a/.gitconfig_includes.cygwin
+++ b/.gitconfig_includes.cygwin
@@ -1,3 +1,9 @@
+[difftool "winmerge"]
+    cmd = 'C:/Program Files (x86)/WinMerge/WinMergeU.exe' "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)"
+    trustExitCode = false
+[difftool "p4merge"]
+    cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)"
+    trustExitCode = false
 [mergetool "p4merge"]
     cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $BASE)" "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" "$(cygpath -wla $MERGED)" 
     trustExitCode = false