X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=t%2Ft1200-tutorial.sh;h=10024133e3e69af0d14200d23c00d1ba7d1dbf74;hb=ad0b46bf4a8ac931687341234bf61fd9c41880a2;hp=c8a85f92dd271be54461ef3fce7f6e6cd8b53e87;hpb=d9ad59e7636d98daa6131e9fd2cb2b4f5745a853;p=git.git diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index c8a85f92..10024133 100755 --- a/t/t1200-tutorial.sh +++ b/t/t1200-tutorial.sh @@ -128,7 +128,7 @@ test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output git checkout mybranch cat > resolve.expect << EOF -Updating from VARIABLE to VARIABLE. +Updating from VARIABLE to VARIABLE example | 1 + hello | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)