Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 23917:3cbb5bf4035d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
messages: quote "hg help" hints consistently
author Wagner Bruna <wbruna@yahoo.com>
date Sat, 17 Jan 2015 22:01:14 -0200
parents 426607be9c69
children a43fdf33a6be
comparison
equal deleted inserted replaced
23916:a3f7c781786b 23917:3cbb5bf4035d
1365 raise util.Abort(_("cannot commit merge with missing files")) 1365 raise util.Abort(_("cannot commit merge with missing files"))
1366 1366
1367 ms = mergemod.mergestate(self) 1367 ms = mergemod.mergestate(self)
1368 for f in status.modified: 1368 for f in status.modified:
1369 if f in ms and ms[f] == 'u': 1369 if f in ms and ms[f] == 'u':
1370 raise util.Abort(_("unresolved merge conflicts " 1370 raise util.Abort(_('unresolved merge conflicts '
1371 "(see hg help resolve)")) 1371 '(see "hg help resolve")'))
1372 1372
1373 if editor: 1373 if editor:
1374 cctx._text = editor(self, cctx, subs) 1374 cctx._text = editor(self, cctx, subs)
1375 edited = (text != cctx._text) 1375 edited = (text != cctx._text)
1376 1376