##// END OF EJS Templates
commands: fix typo in help text
Jens Bäckman -
r10224:712dc3b6 stable
parent child Browse files
Show More
@@ -2460,7 +2460,7 b' def resolve(ui, repo, *pats, **opts):'
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
General Comments 0
You need to be logged in to leave comments. Login now