diff --git a/.gitconfig_includes.cygwin b/.gitconfig_includes.cygwin
index e69de29b..cb3e6e39 100644
--- a/.gitconfig_includes.cygwin
+++ b/.gitconfig_includes.cygwin
@@ -0,0 +1,5 @@
+[mergetool "p4merge"]
+    cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $BASE)" "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" "$(cygpath -wla $MERGED)" 
+    trustExitCode = false
+[merge]
+  tool = p4merge