# 
# patch "ChangeLog"
#  from [96d733329bf930205f319adea167c9b7f67ff818]
#    to [b268bbac81d2ab414ea430559c367202745c15b5]
# 
# patch "NEWS"
#  from [542980b88bf5ccbb9d66b70a313f41a4896c0241]
#    to [dca778bd26c8b31718184bdc35f5954af6ade760]
# 
# patch "UPGRADE"
#  from [49b7cc4201d9f3019ec320ad318f99abbe423b3c]
#    to [d6fb0d1273131b999c0051dadd9a5e7010d72041]
# 
===============================================
--- ChangeLog	96d733329bf930205f319adea167c9b7f67ff818
+++ ChangeLog	b268bbac81d2ab414ea430559c367202745c15b5
@@ -1,5 +1,10 @@
 2005-08-08  Nathaniel Smith  <address@hidden>
 
+	* UPGRADE: Fix title.
+	* NEWS: Add --lca.
+
+2005-08-08  Nathaniel Smith  <address@hidden>
+
 	* commands.cc (merge, propagate): Take --lca.
 	* options.hh: Add OPT_LCA.
 	* monotone.cc (coptions, cpp_main): Support it it.
===============================================
--- NEWS	542980b88bf5ccbb9d66b70a313f41a4896c0241
+++ NEWS	dca778bd26c8b31718184bdc35f5954af6ade760
@@ -13,8 +13,11 @@
           instead, get_netsync_read_permitted will be called with a
           key name of nil.  server administrators should update/review
           their configuration
+        - new option for merge and propagate: --lca.  Until we get a
+          long-term solution to the various 3-way merge problems, this
+          should be more convenient than using explicit_merge.
         - many small improvements to error messages, fixes of minor
-          annoyances, etc.
+          annoyances, netsync tickers more accurate, etc.
 
 Sun Jul 17 16:48:26 PDT 2005
 
===============================================
--- UPGRADE	49b7cc4201d9f3019ec320ad318f99abbe423b3c
+++ UPGRADE	d6fb0d1273131b999c0051dadd9a5e7010d72041
@@ -1,4 +1,4 @@
-upgrading monotone to 0.21
+upgrading monotone to 0.22
 ==========================
 
 if you are upgrading from: