equal
deleted
inserted
replaced
3 # |
3 # |
4 |
4 |
5 from __future__ import absolute_import |
5 from __future__ import absolute_import |
6 |
6 |
7 from mercurial import ( |
7 from mercurial import ( |
8 cmdutil, |
|
9 merge, |
8 merge, |
|
9 registrar, |
10 ) |
10 ) |
11 |
11 |
12 cmdtable = {} |
12 cmdtable = {} |
13 command = cmdutil.command(cmdtable) |
13 command = registrar.command(cmdtable) |
14 |
14 |
15 @command('fakemergerecord', |
15 @command('fakemergerecord', |
16 [('X', 'mandatory', None, 'add a fake mandatory record'), |
16 [('X', 'mandatory', None, 'add a fake mandatory record'), |
17 ('x', 'advisory', None, 'add a fake advisory record')], '') |
17 ('x', 'advisory', None, 'add a fake advisory record')], '') |
18 def fakemergerecord(ui, repo, *pats, **opts): |
18 def fakemergerecord(ui, repo, *pats, **opts): |