diff -r bccb322f1496 -r b63b8b7ca5fa mercurial/context.py
--- 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)))