X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft1200-tutorial.sh;h=f4d53c078a4a476c5dfadcfb2582dbb97c71db5c;hb=cf9dc65368113caa28f2829e2ada5477fbb031ec;hp=10024133e3e69af0d14200d23c00d1ba7d1dbf74;hpb=cf1e6d1ec55264272be8b7f0c276a069d2aac69a;p=git.git diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index 10024133..f4d53c07 100755 --- 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.