Fix mismerge

[exim.git] / test / scripts / 0000-Basic / 0281

diff --git a/test/scripts/0000-Basic/0281 b/test/scripts/0000-Basic/0281
index ae5624792ab2fbc58a7e3d2376f05f69c24a866e..f8de7f7f58bbecbfda9d85fcff5dfe8e436701a1 100644 (file)
--- a/test/scripts/0000-Basic/0281
+++ b/test/scripts/0000-Basic/0281
@@ -1,5 +1,6 @@
 # @ items in domain lists and host lists
 exim -bh V4NET.1.1.1
 # @ items in domain lists and host lists
 exim -bh V4NET.1.1.1

+helo test

 mail from:<x@y>
 rcpt to:<1@myhost.test.ex>
 rcpt to:<1@[127.0.0.1]>
 mail from:<x@y>
 rcpt to:<1@myhost.test.ex>
 rcpt to:<1@[127.0.0.1]>


@@ -21,16 +22,19 @@ rcpt to:<5@myhost.test.ex>
 quit
 ****
 exim -bh V4NET.10.10.10
 quit
 ****
 exim -bh V4NET.10.10.10

+helo test

 mail from:<x@y>
 rcpt to:<5@myhost.test.ex>
 quit
 ****
 exim -bh 127.0.0.1
 mail from:<x@y>
 rcpt to:<5@myhost.test.ex>
 quit
 ****
 exim -bh 127.0.0.1

+helo test

 mail from:<x@y>
 rcpt to:<5@myhost.test.ex>
 quit
 ****
 exim -bh V4NET.1.1.1
 mail from:<x@y>
 rcpt to:<5@myhost.test.ex>
 quit
 ****
 exim -bh V4NET.1.1.1

+helo test

 mail from:<x@y>
 rcpt to:<2@mxt3.test.ex>
 rcpt to:<3@mxt3.test.ex>
 mail from:<x@y>
 rcpt to:<2@mxt3.test.ex>
 rcpt to:<3@mxt3.test.ex>