problems in merge.1

[esr]

This is automatically generated email about problems in a man page for which
you appear to be responsible.  If you are not the right person or list, tell
me and I will attempt to correct my database.

See http://catb.org/~esr/doclifter/problems.html for details on how and
why these patches were generated.  Feel free to email me with any questions.
Note: These patches do not change the mod date of any manual page.  You
may wish to do that by hand.

Problems with merge.1:

1. Attempt to interpolate unknown string.

2. List syntax error. This means .IP, .TP or .RS/.RE markup is garbled.
This confuses doclifter, and may also mess up stricter troff
interpreters like Xman and Rosetta.

--- merge.1-orig        2007-01-05 12:28:18.000000000 -0500
+++ merge.1     2007-01-05 12:28:49.000000000 -0500
@@ -114,8 +114,9 @@
 .TP
 .BI \-q
 Quiet; do not warn about conflicts.
+.TP
 .BI \-V
-Print \*r's version number.
+Print merge's version number.
 .SH DIAGNOSTICS
 Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble.
 .SH IDENTIFICATION
-----------------------------

--
                             Eric S. Raymond