Merge branch 'master'

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index bc3e711a525f164f21132438d4d4e12e3dc10698..c339a366f4a107eeb12bdd596f2ade79a1f9f583 100755 (executable)
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -33,7 +33,7 @@ then
 fi
 
 merge >/dev/null 2>/dev/null
-if test $? == 127
+if test $? = 127
 then
        echo >&2 'You do not seem to have "merge" installed.
 Please check INSTALL document.'