Merge branch 'jc/diff-test' into th/diff

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index 16b3ea915776e976890dfc5a9a9748c92de2d3fb..c7db20e7f3c91e4f07ba4ba9714bb0aabc765317 100755 (executable)
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.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.