git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
SRS: fix mismerge
[exim.git]
/
src
/
src
/
expand.c
diff --git
a/src/src/expand.c
b/src/src/expand.c
index 3428179d8790c50284ccf3c560a66f7a5e4e00eb..45172b1ed3d2479c977416b502d63e1ec61c0f81 100644
(file)
--- a/
src/src/expand.c
+++ b/
src/src/expand.c
@@
-7047,6
+7047,7
@@
while (*s)
case 2:
case 3: goto EXPAND_FAILED;
}
+ if (flags & ESI_SKIPPING) continue;
if (sub[1] && *(sub[1]))
{