Merge branch 'jk/difftool-in-subdir'

diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 4451127eb24051dcc3d2aebd443d10619c525e27..9d87777b5994910dda971b57fd67b733ee9b5398 100755 (executable)
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -99,4 +99,11 @@ test_expect_success '-L with --first-parent and a merge' '
        git log --first-parent -L 1,1:b.c
 '
 
+test_expect_success '-L with --output' '
+       git checkout parallel-change &&
+       git log --output=log -L :main:b.c >output &&
+       test ! -s output &&
+       test_line_count = 70 log
+'
+
 test_done