# 
# patch "ChangeLog"
#  from [eff9a1b084062e5c3330260c8b501e8f5952381f]
#    to [098305e163257ba64bfcc5d5caf3d24e0e9c8c70]
# 
# patch "monotone.texi"
#  from [b1147c864ad611f55aec986899580628fc4ceb16]
#    to [a17c1a2ee169272aafec741dcc5f6b41908548d0]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2005-06-09  Richard Levitte  <address@hidden>
+
+	* monotone.texi (Merging): I assume that "apposite" was supposed
+	to be "appropriate".
+
 2005-06-09  Riccardo Ghetta  <address@hidden>
 
 	* diff_patch.cc/hh: honor the new manual_merge attribute
--- monotone.texi
+++ monotone.texi
@@ -2937,7 +2937,7 @@
 @end smallexample
 
 The attribute could also be manually forced or removed using the
-apposite monotone commands.
+appropriate monotone commands.
 Remember that monotone switches to manual merging even if only one of
 the files to be merged has the @code{manual_merge} attribute set.