[PATCH] Fix t7601-merge-pull-config.sh on AIX

[Miklos Vajna <vmiklos@xxxxxxxxxxxxxx>]

The test failed on AIX (and likely other OS, such as apparently OSX)
where wc -l outputs whitespace.

Signed-off-by: Mike Ralphson <mike@xxxxxxxxxxxx>
Signed-off-by: Miklos Vajna <vmiklos@xxxxxxxxxxxxxx>
---

Here is the same, with backticks avoided, and with a proper commit
message.

 t/t7601-merge-pull-config.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 32585f8..12f71ad 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -70,10 +70,10 @@ test_expect_success 'merge c1 with c2 and c3 (recursive and octopus in pull.octo
 
 conflict_count()
 {
-	eval $1=`{
+	eval $1=$({
 		git diff-files --name-only
 		git ls-files --unmerged
-	} | wc -l`
+	} | wc -l | tr -d \ )
 }
 
 # c4 - c5
-- 
1.5.6.1

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html