Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 6642:c8c7248f6172

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: add file codes to doc string
author Adrian Buehlmann <adrian@cadifra.com>
date Sat, 31 May 2008 11:37:55 +0200
parents 1603bba96411
children 9eb274d773d9 ffcf8e82f647
comparison
equal deleted inserted replaced
6641:1603bba96411 6642:c8c7248f6172
2250 This command will attempt to resolve unresolved merges from the 2250 This command will attempt to resolve unresolved merges from the
2251 last update or merge command. This will use the local file 2251 last update or merge command. This will use the local file
2252 revision preserved at the last update or merge to cleanly retry 2252 revision preserved at the last update or merge to cleanly retry
2253 the file merge attempt. With no file or options specified, this 2253 the file merge attempt. With no file or options specified, this
2254 command will attempt to resolve all unresolved files. 2254 command will attempt to resolve all unresolved files.
2255
2256 The codes used to show the status of files are:
2257 U = unresolved
2258 R = resolved
2255 """ 2259 """
2256 2260
2257 if len([x for x in opts if opts[x]]) > 1: 2261 if len([x for x in opts if opts[x]]) > 1:
2258 raise util.Abort(_("too many options specified")) 2262 raise util.Abort(_("too many options specified"))
2259 2263