Merge branch 'lt/diff' into next

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index c8a85f92dd271be54461ef3fce7f6e6cd8b53e87..10024133e3e69af0d14200d23c00d1ba7d1dbf74 100755 (executable)
--- 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(-)