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
Fix mismerge
[exim.git]
/
test
/
stderr
/
0123
diff --git
a/test/stderr/0123
b/test/stderr/0123
index d9f4557f54cc0b7bedf49fe78302f2f45f2224ed..a25f0e5e0d8b1e8a41e8fd7d19d15d128ffacd0b 100644
(file)
--- a/
test/stderr/0123
+++ b/
test/stderr/0123
@@
-1,4
+1,5
@@
Exim version x.yz ....
+Hints DB:
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=p1234
configuration file is TESTSUITE/test-config