Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 10224:712dc3b6db68 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: fix typo in help text
author Jens B?ckman <jens.backman@gmail.com>
date Sat, 09 Jan 2010 23:03:33 +0100
parents 43f8abcec42d
children e3e41e5e7ff4 25e572394f5c
comparison
equal deleted inserted replaced
10220:500d09be7ace 10224:712dc3b6db68
2458 2458
2459 If a conflict is resolved manually, please note that the changes 2459 If a conflict is resolved manually, please note that the changes
2460 will be overwritten if the merge is retried with resolve. The 2460 will be overwritten if the merge is retried with resolve. The
2461 -m/--mark switch should be used to mark the file as resolved. 2461 -m/--mark switch should be used to mark the file as resolved.
2462 2462
2463 You can specify a set of files to operate on, or use the -a/-all 2463 You can specify a set of files to operate on, or use the -a/--all
2464 switch to select all unresolved files. 2464 switch to select all unresolved files.
2465 2465
2466 This command also allows listing resolved files and manually 2466 This command also allows listing resolved files and manually
2467 indicating whether or not files are resolved. All files must be 2467 indicating whether or not files are resolved. All files must be
2468 marked as resolved before a commit is permitted. 2468 marked as resolved before a commit is permitted.