From 825be6d69a33f6b3cd69338e9a7f19f09c3385c3 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Wed, 22 Apr 2015 10:59:00 +0200
Subject: [PATCH] use p4merge under windows, for mergetool only

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

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