summaryrefslogtreecommitdiff
path: root/doc/concepts/expressions.org
diff options
context:
space:
mode:
Diffstat (limited to 'doc/concepts/expressions.org')
-rw-r--r--doc/concepts/expressions.org5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/concepts/expressions.org b/doc/concepts/expressions.org
index c8d2a9a5..50737413 100644
--- a/doc/concepts/expressions.org
+++ b/doc/concepts/expressions.org
@@ -255,7 +255,10 @@ those) argument(s) to obtain the final result.
~"subdir"~ argument and the base name of the old key. It is an
error if conflicts occur in this way; in case of such a user
error, the argument ~"msg"~ is also evaluated and the result
- of that evaluatino reported in the error message.
+ of that evaluation reported in the error message. Note that
+ conflicts can also occur in non-flat staging if two keys are
+ different as strings, but name the same path (like ~"foo.txt"~
+ and ~"./foo.txt"~), and are assigned different values.
***** Binary functions