# 
# patch "AUTHORS"
#  from [36534b3b81f00bdef9268973bd83825512b61098]
#    to [f35734d11360759c5adfc22efab965b9facc3f9f]
# 
# patch "ChangeLog"
#  from [6b49c2cdcfafd535f770953cf14b0369f5f28d0a]
#    to [0194ee317c42827ba6a2cb95dbbdce3c8b87037f]
# 
# patch "NEWS"
#  from [471710897abc2d743bc0417fda0bcd13745da2b0]
#    to [2aa0fd8da22bd0fd882f3b8015ca2bf3a93e88b9]
# 
# patch "UPGRADE"
#  from [0a845a51043a2ce904ee1df651f992cfa1f1bf0e]
#    to [486bc602ad817c4decd4afd0adb0a6be37889796]
# 
--- AUTHORS
+++ AUTHORS
@@ -64,6 +64,7 @@
   Eric Anderson <address@hidden>
   Kaushik Veeraraghavan <address@hidden>
   Jordan Breeding <address@hidden>
+  Vladimir Vukicevic <address@hidden>
 
 supporting files:
 -----------------
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,11 @@
 2005-07-17  Nathaniel Smith  <address@hidden>
 
+	* NEWS: Add diff changes, more tweaking.
+	* UPGRADE: Update for 0.21.
+	* AUTHORS: Add Vladimir Vukicevic.
+
+2005-07-17  Nathaniel Smith  <address@hidden>
+
 	* tests/t_diff_external.at: New test.
 	* testsuite.at: Add it.
 
--- NEWS
+++ NEWS
@@ -13,29 +13,37 @@
           <address@hidden>, Matthew Gregan
           <address@hidden>, Jordan Breeding
           <address@hidden>.
-        - new netsync options:
-          - "--exclude": branches are included if
+        - ui enhancements:
+          - new netsync option "--exclude": branches are included if
             they match any of the given globs, unless they match any
             of the given --exclude globs.  special thanks to Timothy
             Brownawell <address@hidden>.
-          - "--set-default": makes it easy to change default
-            server/branches.
-        - b: and t: selectors now match exactly, instead of matching
-          as substrings.  globbing is supported for inexact matching.
-          special thanks to Brian Downing <address@hidden>, Jordan
-          Breeding <address@hidden>.
-        - use sqlite3 prepared statements.  special thanks to Derek
-          Scherger <address@hidden>.
+          - new netsync option client "--set-default": makes it easy
+            to change default server/branches.
+          - "diff" now takes options "--context" and "--external", to
+            output context diffs and to invoke an external diff
+            program for full control over output formatting.  new
+            option "--diff-args" pass arguments to external diff
+            program; new hook "external_diff" allows further
+            configuration.  special thanks to Vladimir Vukicevic
+            <address@hidden>.
+          - b: and t: selectors now match exactly, instead of matching
+            as substrings.  globbing is supported for inexact
+            matching.  special thanks to Brian Downing
+            <address@hidden>, Jordan Breeding
+            <address@hidden>.
+          - new command 'db kill_tag_locally'.  special thanks to Jordan
+            Breeding <address@hidden>.
+        - now uses sqlite3 prepared statements.  special thanks to
+          Derek Scherger <address@hidden>.
         - 'db migrate' is now a complete no-op if there is no
           migration to do; automated scripts can now call it
           optimistically and cheaply to guarantee up-to-dateness.
-        - new command 'db kill_tag_locally'.  special thanks to Jordan
-          Breeding <address@hidden>.
         - new hash correctness tests.  special thanks to Kaushik
           Veeraraghavan <address@hidden>.
 
                 - upgrading from 0.20: you must run 'monotone db
-                  migrate' against each of your databases once, to add
+                  migrate' once against each of your databases, to add
                   new sql indexes.
 
 Tue Jul  5 23:57:10 PDT 2005
--- UPGRADE
+++ UPGRADE
@@ -1,9 +1,11 @@
-upgrading monotone to 0.20
+upgrading monotone to 0.21
 ==========================
 
 if you are upgrading from:
-  - 0.19 or earlier: there are some command line and server
-    configuration changes; see NEWS.
+  - 0.20 or earlier: you need to run 'db migrate' against each of your
+    databases.
+  - 0.19 or earlier: there are incompatible command line and server
+    configuration changes; see NEWS for 0.20.
   - 0.18 or earlier: if you have created a ~/.monotonerc, rename it to
     ~/.monotone/monotonerc, so monotone will still find it.
   - 0.17: simply make a backup of your databases, just in case, and