aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2014-06-02 09:06:56 +0200
committerJunio C Hamano <gitster@pobox.com>2014-06-02 11:05:33 -0700
commit644edd02c192bcdb0419dd40ce95cf41fe8fd446 (patch)
treede9fca8e9d0d0dff1da6543ea30d2b7f342876ac /merge-recursive.h
parentd952cbb1908b54c6a04f37c8b0924a49cdb5997d (diff)
downloadgit-644edd02c192bcdb0419dd40ce95cf41fe8fd446.tar.gz
git-644edd02c192bcdb0419dd40ce95cf41fe8fd446.tar.xz
fix brown paper bag breakage in t5150-request-pull.sh
The recent addition to the test case 'pull request format' interrupted the single-quoted text, effectively adding a third argument to the test_expect_success command. Since we do not have a prerequisite named "pull request format", the test is skipped, no matter what. Additionally, the file name argument to the grep command is missing. Fix both issues. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions