diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-08 17:48:51 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-08 17:49:10 +0000 |
| commit | 84c011ae6133fb007046d8eb66c01d0de80b3500 (patch) | |
| tree | 60b2be37885c99f0bf69434223b01cc5a2b92203 /testing/util.py | |
| parent | Releasing debian version 2.10.1-1. (diff) | |
| download | pre-commit-84c011ae6133fb007046d8eb66c01d0de80b3500.tar.xz pre-commit-84c011ae6133fb007046d8eb66c01d0de80b3500.zip | |
Merging upstream version 2.11.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/util.py')
| -rw-r--r-- | testing/util.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/testing/util.py b/testing/util.py index 1f8cb35..1364453 100644 --- a/testing/util.py +++ b/testing/util.py @@ -70,6 +70,7 @@ def run_opts( show_diff_on_failure=False, commit_msg_filename='', checkout_type='', + is_squash_merge='', ): # These are mutually exclusive assert not (all_files and files) @@ -88,6 +89,7 @@ def run_opts( show_diff_on_failure=show_diff_on_failure, commit_msg_filename=commit_msg_filename, checkout_type=checkout_type, + is_squash_merge=is_squash_merge, ) |