--- a/tests/test-rebase-inmemory.t Thu Apr 11 18:34:56 2019 +0200
+++ b/tests/test-rebase-inmemory.t Wed Apr 10 16:26:40 2019 -0700
@@ -252,7 +252,7 @@
$ hg rebase -r 3 -d . -n
starting dry-run rebase; repository will not be changed
rebasing 3:844a7de3e617 "c"
- abort: error: file 'c' cannot be written because 'c/' is a folder in e147e6e3c490 (containing 1 entries: c/subdir/file.txt)
+ abort: error: file 'c' cannot be written because 'c/' is a directory in e147e6e3c490 (containing 1 entries: c/subdir/file.txt)
[255]
$ cd ..