Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 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 db2392a4effc
children 0c6cdbb697d9
comparison
equal deleted inserted replaced
21720:db2392a4effc 21721:6539c4e9c874
4993 util.rename(a + ".resolve", a + ".orig") 4993 util.rename(a + ".resolve", a + ".orig")
4994 4994
4995 ms.commit() 4995 ms.commit()
4996 4996
4997 if not didwork and pats: 4997 if not didwork and pats:
4998 ui.warn(_("arguments do not match paths that need resolved\n")) 4998 ui.warn(_("arguments do not match paths that need resolving\n"))
4999 4999
5000 finally: 5000 finally:
5001 wlock.release() 5001 wlock.release()
5002 5002
5003 # Nudge users into finishing an unfinished operation. We don't print 5003 # Nudge users into finishing an unfinished operation. We don't print