[PATCH] man/merge.1

In <http://lists.gnu.org/archive/html/bug-rcs/2007-01/msg00001.html>,
there is a patch for merge.1, but i believe it is not optimal, in the
sense that it hardcodes a value instead of providing a definition for
the missing macro.

Please find attached an updated one.  A suitable ChangeLog entry:

2010-02-10  Thien-Thi Nguyen  <[email protected]>

        * merge.1: Fix syntax errors: (1) define string `r';
        (2) add list element separator between -q and -V entries.

Happy hacking,
thi

___________________________________
--- merge.1.ORIG	2006-12-15 09:54:02.000000000 +0100
+++ merge.1	2006-12-15 10:05:36.000000000 +0100
@@ -3,6 +3,7 @@
 .ds Dt \\$4
 ..
 .Id $Id: merge.1,v 5.7 1995/06/01 16:23:43 eggert Exp $
+.ds r \&\s-1RCS\s0
 .TH MERGE 1 \*(Dt GNU
 .SH NAME
 merge \- three-way file merge
@@ -114,6 +115,7 @@
 .TP
 .BI \-q
 Quiet; do not warn about conflicts.
+.TP
 .BI \-V
 Print \*r's version number.
 .SH DIAGNOSTICS