support pre-merge-commit

This commit is contained in:
Anthony Sottile 2019-11-06 19:13:12 -08:00
parent bf68512e7d
commit c699e255a1
6 changed files with 39 additions and 6 deletions

View file

@ -895,7 +895,8 @@ def test_manifest_hooks(tempdir_factory, store):
pass_filenames=True,
require_serial=False,
stages=(
'commit', 'prepare-commit-msg', 'commit-msg', 'manual', 'push',
'commit', 'merge-commit', 'prepare-commit-msg', 'commit-msg',
'manual', 'push',
),
types=['file'],
verbose=False,