A few notes added in the manual regarding how to proceed in
merges.

Reference: /n/patches.lsub.org/patch/patchmanmerge
Date: Sun Apr 15 12:21:32 CES 2012
Signed-off-by: nemo@lsub.org

--- /sys/man/1/patch	Sat Apr 14 02:27:02 2012
+++ /sys/man/1/patch	Sun Apr 15 12:14:50 2012
@@ -151,6 +151,13 @@
 .PP
 .I Patch/notify
 is run frequently close to the main distribution to notify by mail of patch creations.
+.PP
+If there are conflicts you can resolve them by manually updating your local files
+as you please and then running
+.IR patch/appied ,
+which declares the patch as applied. To update your local files you can refer to the
+.BI /dist/patch/ patchname 
+directory which keeps the list of files affected as well as their old and new versions.
 .SH EXAMPLES
 Propose a change to
 .IR pwd ,