diff options
| author | James Fargher <jfargher@gitlab.com> | 2022-11-09 01:48:23 +0300 |
|---|---|---|
| committer | James Fargher <jfargher@gitlab.com> | 2022-11-14 23:41:38 +0300 |
| commit | 29b840a4e980bc61e64f7ebc958f1338c9d6365a (patch) | |
| tree | a75aa23215b0d16a87a76fba5c894b6acab03cc5 | |
| parent | 140dcf708e56f01f962e33e12ab52bea4e438c79 (diff) | |
git/conflict: Enable tests in sha256 mode
These tests are object hash agnostic.
| -rw-r--r-- | internal/git/conflict/parser_test.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/internal/git/conflict/parser_test.go b/internal/git/conflict/parser_test.go index 5d3ece314..52c308320 100644 --- a/internal/git/conflict/parser_test.go +++ b/internal/git/conflict/parser_test.go @@ -1,5 +1,3 @@ -//go:build !gitaly_test_sha256 - package conflict import ( |