Mercurial > hg

comparison tests/test-resolve.t @ 21721:6539c4e9c874

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: fix grammar of no matching files message
author Matt Mackall <mpm@selenic.com>
date Mon, 09 Jun 2014 14:11:17 -0500
parents 6062593d8b06
children b081decd9062
comparison
equal deleted inserted replaced
21720:db2392a4effc 21721:6539c4e9c874
31 $ hg resolve -l 31 $ hg resolve -l
32 U file 32 U file
33 33
34 resolving an unknown path emits a warning 34 resolving an unknown path emits a warning
35 $ hg resolve -m does-not-exist 35 $ hg resolve -m does-not-exist
36 arguments do not match paths that need resolved 36 arguments do not match paths that need resolving
37 37
38 resolve the failure 38 resolve the failure
39 39
40 $ echo resolved > file 40 $ echo resolved > file
41 $ hg resolve -m file 41 $ hg resolve -m file