summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
Diffstat (limited to 't')
-rwxr-xr-xt/t4211-line-log.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 7665d6785c..3be25a3a7f 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -77,4 +77,9 @@ test_expect_success '-L {empty-range} (first -L)' '
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