Mercurial > public > mercurial-scm > hg

diff mercurial/context.py @ 42100:b63b8b7ca5fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
messages: replace some instances of "folder" by "directory" I'm pretty sure this is our preferred term. Differential Revision: https://phab.mercurial-scm.org/D6222
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 10 Apr 2019 16:26:40 -0700
parents 6fef387af1da
children f4b1f5537d4c
line wrap: on
line diff
--- a/mercurial/context.py	Thu Apr 11 18:34:56 2019 +0200
+++ b/mercurial/context.py	Wed Apr 10 16:26:40 2019 -0700
@@ -1965,7 +1965,7 @@
             if not mfiles:
                 return
             raise error.Abort("error: file '%s' cannot be written because "
-                              " '%s/' is a folder in %s (containing %d "
+                              " '%s/' is a directory in %s (containing %d "
                               "entries: %s)"
                               % (path, path, self.p1(), len(mfiles),
                                  ', '.join(mfiles)))