[Monotone-commits-diffs] net.venge.monotone: 8a1d9f3f92a91260481cf11a240d21a34a48712b

[code]

revision:            8a1d9f3f92a91260481cf11a240d21a34a48712b
date:                2011-01-10T04:19:50
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
'see @xref' produces 'see See ...', better change it to 'see @ref',
even though that still won't look good in Info mode

manifest:
format_version "1"

new_manifest [1a96ddc8d4665d117b7aad47b42efdbe70a1473e]

old_revision [75798085b9d97261387f813b2e80f7a4cdcaeb4a]

patch "monotone.texi"
 from [583f23e1b6e154ec64db813a8235a9aa03b35875]
   to [171ce022211bb287fdc56ffae156a5225b9e63ef]
============================================================
--- monotone.texi	583f23e1b6e154ec64db813a8235a9aa03b35875
+++ monotone.texi	171ce022211bb287fdc56ffae156a5225b9e63ef
@@ -3210,7 +3210,7 @@ @section Merge Conflicts
 specify resolutions for some conflicts. The resolutions are stored in a
 file, and given to the @command{merge} command via the
 @command{--resolve-conflicts-file=filename} or
address@hidden option; see @xref{Conflicts}.
address@hidden option; see @ref{Conflicts}.
 
 The @command{merge} command normally will perform as many merges as
 necessary to merge all current heads of a branch. However, when