mdoc(7) police:

Use -tag list in the FILES section to work around the bug
when .Pa font is not restored to its original value if one
of the -hang, -ohang, or -inset lists is used in the FILES
section.  (The fix for the bug has just been submitted to
the GNU Groff maintainers.)

Also, fixed the Handbook reference in the SEE ALSO.

usr.sbin/mergemaster/mergemaster.8

@@ -259,9 +259,10 @@ comparison, use:
 .Pp
 .Dl # mergemaster -sw 110
 .Sh FILES
-.Bl -ohang
+.Bl -tag -width $HOME/.mergemasterrc -compact
 .It Pa /etc/mergemaster.rc
 .It Pa $HOME/.mergemasterrc
+.El
 .Pp
 .Nm
 will . (source) these files if they exist.
@@ -316,7 +317,6 @@ with all values commented out:
 #MM_PRE_COMPARE_SCRIPT=
 #MM_EXIT_SCRIPT=
 .Ed
-.El
 .Sh SEE ALSO
 .Xr cvs 1 ,
 .Xr diff 1 ,
@@ -326,10 +326,11 @@ with all values commented out:
 .Xr pwd_mkdb 8
 .Pp
 .Pa /usr/src/etc/Makefile
-.Pp
-http://www.FreeBSD.org/handbook/makeworld.html ,
-.Pa The Cutting Edge (using make world) ,
-by Nik Clayton
+.Rs
+.%O http://www.FreeBSD.org/handbook/makeworld.html
+.%T The Cutting Edge (using make world)
+.%A Nik Clayton
+.Re
 .Sh DIAGNOSTICS
 Exit status is 0 on successful completion, or if the user bails out
 manually at some point during execution.