From: Alex Riesen <raa.lkml@gmail.com>
Date: Fri, 12 Dec 2008 12:29:00 GMT
Subject: [PATCH] Fix t7606 on Cygwin: for some reasont it does not recognize a "." in PATH
Message-ID: <81b0412b0812120428mc85ae84r260b722022dc3449@mail.gmail.com>

The test uses the dot to add custom merge strategies
---
 t/t7606-merge-custom.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


From 928b2b955bd2ef0e400de698c0c0bcde5e64638b Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Mon, 29 Sep 2008 17:07:00 +0200
Subject: [PATCH] Fix t7606 on Cygwin: for some reasont it does not recognize a "." in PATH

The test uses the dot to add custom merge strategies
---
 t/t7606-merge-custom.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh
index 52a451d..20c0907 100755
--- a/t/t7606-merge-custom.sh
+++ b/t/t7606-merge-custom.sh
@@ -11,7 +11,7 @@ cat >git-merge-theirs <<EOF
 eval git read-tree --reset -u \\\$\$#
 EOF
 chmod +x git-merge-theirs
-PATH=.:$PATH
+PATH=$(pwd):"$PATH"
 export PATH
 
 test_expect_success 'setup' '
-- 
1.6.1.rc2.48.g3c7df