merge: refuse --commit with --squash

diff --git a/t/t9004-example.sh b/t/t9004-example.sh
index b28a028f5503508a4a09c6a07950027d253a1846..7e8894a4a70648fd12d3ab4425f1beac2c3e4641 100755 (executable)
--- a/t/t9004-example.sh
+++ b/t/t9004-example.sh
@@ -4,7 +4,7 @@ test_description='check that example code compiles and runs'
 . ./test-lib.sh
 
 test_expect_success 'decorate' '
-       test-example-decorate
+       test-tool example-decorate
 '
 
 test_done