equal
deleted
inserted
replaced
86 $ cat > $TESTTMP/markdriver.py << EOF |
86 $ cat > $TESTTMP/markdriver.py << EOF |
87 > '''mark and unmark files as driver-resolved''' |
87 > '''mark and unmark files as driver-resolved''' |
88 > from mercurial import merge, registrar, scmutil |
88 > from mercurial import merge, registrar, scmutil |
89 > cmdtable = {} |
89 > cmdtable = {} |
90 > command = registrar.command(cmdtable) |
90 > command = registrar.command(cmdtable) |
91 > @command('markdriver', |
91 > @command(b'markdriver', |
92 > [('u', 'unmark', None, '')], |
92 > [('u', 'unmark', None, '')], |
93 > 'FILE...') |
93 > 'FILE...') |
94 > def markdriver(ui, repo, *pats, **opts): |
94 > def markdriver(ui, repo, *pats, **opts): |
95 > wlock = repo.wlock() |
95 > wlock = repo.wlock() |
96 > try: |
96 > try: |