summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-05-15 10:24:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-15 10:25:58 -0700
commit4024295568276bffbea6d2c84a9feb1ad1205a41 (patch)
treefe848877f143f33b26a8c8114d68210d8b57b25d /git-merge-resolve.sh
parentRevert "t/test_lib: avoid naked bash arrays in file_lineno" (diff)
downloadtgif-4024295568276bffbea6d2c84a9feb1ad1205a41.tar.xz
Revert "ci: add a problem matcher for GitHub Actions"
This reverts commit 676eb0c1ce0d380478eb16bdc5a3f2a7bc01c1d2; as we will be reverting the change to show these extra output tokens under bash, the pattern would not match anything. Helped-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions