X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft1200-tutorial.sh;h=9356beaf4be45c32d10209c5063b7a9c5aa06d42;hb=0cfba96121b9617668a7b4ad18e3ae3a19dc8755;hp=5e29e13782ffad74915128adf163d57eef16f4e8;hpb=f6be8fbcbafe552a8b60b9c9394203a752de5e06;p=git.git diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index 5e29e1378..9356beaf4 100755 --- a/t/t1200-tutorial.sh +++ b/t/t1200-tutorial.sh @@ -156,7 +156,7 @@ Updating VARIABLE..VARIABLE FASTFORWARD (no commit created; -m option ignored) example | 1 + hello | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) + 2 files changed, 2 insertions(+) EOF test_expect_success 'git resolve' '