From 65b356f555a716d9f753e58911da2017f3d1c2fc Mon Sep 17 00:00:00 2001
From: Steffen Prohaska <prohaska@zib.de>
Date: Mon, 13 Aug 2007 08:04:14 +0200
Subject: [PATCH] mergetool: converting backslashes in kdiff3 path from Windows
 registry

Backslashes are converted to slashes right after the Windows
registry returned a path. This is needed to avoid problems
with shell expansion.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
 git-mergetool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-mergetool.sh b/git-mergetool.sh
index ac23891980..e7d745062b 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -323,7 +323,7 @@ if test -z "$merge_tool" ; then
         fi
     fi
     regentry="$(REG QUERY 'HKEY_LOCAL_MACHINE\SOFTWARE\KDiff3\diff-ext' 2>/dev/null)" && {
-        KDIFF3=$(echo "$regentry" | grep diffcommand | cut -f 3)
+        KDIFF3=$(echo "$regentry" | grep diffcommand | cut -f 3 | sed -e 's@\\@/@g')
         KDIFF3SEPARATOR=
         merge_tool_candidates="$merge_tool_candidates kdiff3"
     }