Merge branch 'master' of git://github.com/alexhenrie/git-po

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 69bde7aa288d1deebb7d6204e29f88978d880998..ea35a0241c201ac12c29603a21421199dd097600 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -86,6 +86,11 @@ test_expect_success PERL 'difftool forwards exit code with --trust-exit-code' '
        test_must_fail git difftool -y --trust-exit-code -t error branch
 '
 
+test_expect_success PERL 'difftool forwards exit code with --trust-exit-code for built-ins' '
+       test_config difftool.vimdiff.path false &&
+       test_must_fail git difftool -y --trust-exit-code -t vimdiff branch
+'
+
 test_expect_success PERL 'difftool honors difftool.trustExitCode = true' '
        test_config difftool.error.cmd false &&
        test_config difftool.trustExitCode true &&