Merge branch 'maint'

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index 16b3ea915776e976890dfc5a9a9748c92de2d3fb..0272dd429302534846e3a7f221a520bac2907ca8 100755 (executable)
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Johannes Schindelin
 #
 
-test_description='Test git-rev-parse with different parent options'
+test_description='A simple turial in the form of a test case'
 
 . ./test-lib.sh
 
@@ -114,6 +114,8 @@ EOF
 
 git commit -m 'Merged "mybranch" changes.' -i hello
 
+test_done
+
 cat > show-branch.expect << EOF
 * [master] Merged "mybranch" changes.
  ! [mybranch] Some work.