From b541388c84e3e45b27af4e94a6ff976547b97bf8 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Wed, 28 Jan 2015 22:37:39 +0100
Subject: [PATCH] normalized path to the kdiff3 executable script in cygwin

---
 .gitconfig_includes.cygwin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitconfig_includes.cygwin b/.gitconfig_includes.cygwin
index d86e50cf..4ba4540b 100644
--- a/.gitconfig_includes.cygwin
+++ b/.gitconfig_includes.cygwin
@@ -6,7 +6,7 @@
 [diff]
     tool = kdiff3
 [mergetool "kdiff3"]
-    path = kdiff3
+    path = kdiff3.sh
     trustExitCode = false
     keepBackup = false
 [merge]