Merge branch 'jc/name-rev-lw-tag' into maint

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 1c7d6729c699dc8c8784d19659551df24530bd05..6499cdf6ff06b6da3185107f76902cc88767c15d 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -399,7 +399,7 @@ cat > expect <<\EOF
 | |
 | |     Merge branch 'side'
 | |
-| * commit side
+| * commit tags/side-2
 | | Author: A U Thor <author@example.com>
 | |
 | |     side-2