X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft1200-tutorial.sh;h=c8a85f92dd271be54461ef3fce7f6e6cd8b53e87;hb=164dcb97f0cd1accaec4ed40c24881f8e9ae4371;hp=8ff5dd92c9c731c11786669929e3a241c6371eb1;hpb=fec9ebf16c948bcb4a8b88d0173ee63584bcde76;p=git.git diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index 8ff5dd92..c8a85f92 100755 --- a/t/t1200-tutorial.sh +++ b/t/t1200-tutorial.sh @@ -95,13 +95,13 @@ test_expect_success 'git branch' 'cmp branch.expect branch.output' git checkout mybranch echo "Work, work, work" >>hello -git commit -m 'Some work.' hello +git commit -m 'Some work.' -i hello git checkout master echo "Play, play, play" >>hello echo "Lots of fun" >>example -git commit -m 'Some fun.' hello example +git commit -m 'Some fun.' -i hello example test_expect_failure 'git resolve now fails' 'git resolve HEAD mybranch "Merge work in mybranch"' @@ -112,7 +112,7 @@ Play, play, play Work, work, work EOF -git commit -m 'Merged "mybranch" changes.' hello +git commit -m 'Merged "mybranch" changes.' -i hello cat > show-branch.expect << EOF * [master] Merged "mybranch" changes.