From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/t/t4057-diff-combined-paths.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/git/t/t4057-diff-combined-paths.sh') diff --git a/third_party/git/t/t4057-diff-combined-paths.sh b/third_party/git/t/t4057-diff-combined-paths.sh index 4f4b541658a1..dff36b77ec88 100755 --- a/third_party/git/t/t4057-diff-combined-paths.sh +++ b/third_party/git/t/t4057-diff-combined-paths.sh @@ -33,7 +33,7 @@ test_expect_success 'trivial merge - combine-diff empty' ' ' -test_expect_success 'only one truly conflicting path' ' +test_expect_success 'only one trully conflicting path' ' git checkout side && for i in $(test_seq 2 9) do -- cgit 1.4.1