mirror of
https://github.com/pre-commit/pre-commit.git
synced 2026-05-08 08:19:13 -05:00
update tests for latest git
This commit is contained in:
@@ -948,7 +948,7 @@ def test_pre_merge_commit_integration(tempdir_factory, store):
|
|||||||
output_pattern = re_assert.Matches(
|
output_pattern = re_assert.Matches(
|
||||||
r'^\[INFO\] Initializing environment for .+\n'
|
r'^\[INFO\] Initializing environment for .+\n'
|
||||||
r'Bash hook\.+Passed\n'
|
r'Bash hook\.+Passed\n'
|
||||||
r"Merge made by the 'recursive' strategy.\n"
|
r"Merge made by the '(ort|recursive)' strategy.\n"
|
||||||
r' foo \| 0\n'
|
r' foo \| 0\n'
|
||||||
r' 1 file changed, 0 insertions\(\+\), 0 deletions\(-\)\n'
|
r' 1 file changed, 0 insertions\(\+\), 0 deletions\(-\)\n'
|
||||||
r' create mode 100644 foo\n$',
|
r' create mode 100644 foo\n$',
|
||||||
|
|||||||
Reference in New Issue
Block a user