| changeset 48875 | 6000f5b25c9b |
| parent 44413 | 4cabeea6d214 |
| 48874:af0b21d5a930 | 48875:6000f5b25c9b |
|---|---|
12 [hooks] |
12 [hooks] |
13 pretxnchangegroup.reject_merge_commits = \ |
13 pretxnchangegroup.reject_merge_commits = \ |
14 python:hgext.hooklib.reject_merge_commits.hook |
14 python:hgext.hooklib.reject_merge_commits.hook |
15 """ |
15 """ |
16 |
16 |
17 from __future__ import absolute_import |
|
18 |
17 |
19 from mercurial.i18n import _ |
18 from mercurial.i18n import _ |
20 from mercurial import ( |
19 from mercurial import ( |
21 error, |
20 error, |
22 pycompat, |
21 pycompat, |