Merge branch 'po/everyday-doc' into maint

diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 7369d3c517294feda894eba85f7b02ac9a57ccae..0901b3098239863df983faa61d2b00ce2c4d670d 100755 (executable)
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -94,4 +94,9 @@ test_expect_success '-L ,Y (Y == nlines + 2)' '
        test_must_fail git log -L ,$n:b.c
 '
 
+test_expect_success '-L with --first-parent and a merge' '
+       git checkout parallel-change &&
+       git log --first-parent -L 1,1:b.c
+'
+
 test_done