summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2019-06-20 22:42:27 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-06-21 14:08:42 -0700
commitcf7a8515c631192bae203f322dd8b6d68d3983af (patch)
tree2b47071dd59b7ab448a0f6d867c1d099ee7b29a0 /Documentation/git-merge.txt
parenttests: add a special setup where prerequisites fail (diff)
downloadtgif-cf7a8515c631192bae203f322dd8b6d68d3983af.tar.xz
tests: mark two failing tests under FAIL_PREREQS
Fix a couple of tests that would potentially fail under GIT_TEST_FAIL_PREREQS=true. I missed these when annotating other tests in dfe1a17df9 ("tests: add a special setup where prerequisites fail", 2019-05-13) because on my system I can only reproduce this failure when I run the tests as "root", since the tests happen to depend on whether we can fall back on GECOS info or not. I.e. they'd usually fail to look up the ident info anyway, but not always. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions