A patch that erroneus causes a text conflict

[Daniel Näslund]

Hi Stefan!

The patch below fails to apply. I'm investigating why.

Content of the file 'new':
-----------------------------
[[[
    #!/bin/sh
    IFS=@ read name address
    echo "A mail to $name at $address"
    read subject
    echo "Subject: $subject"

The script is fed its input through standard input. Calling this script in the
following manner (the > and $ are prompts)

    $ email <<EOT
    > mat...@docs.uu.se
    > Something strange @ my place
    > EOT

to a shell, will produce the output

    A mail to matkin at docs.uu.se
    Subject: Something strange @ my place
]]]

The patch:
-------------
[[[
Index: new
===================================================================
--- new (revision 2)
+++ new (arbetskopia)
@@ -4,12 +4,7 @@
     read subject
     echo "Subject: $subject"
 
-The script is fed its input through standard input. Calling this script in the
-following manner (the > and $ are prompts)
     > Something strange @ my place
     > EOT
 
-to a shell, will produce the output
 
-    A mail to matkin at docs.uu.se
-    Subject: Something strange @ my place
]]]

Output:
---------
  C         new
  >         rejected hunk @@ -4,12 +4,7 @@
  Summary of conflicts:

Thanks, 
Daniel