The unified diff between revisions [4775b468..] and [5db0a3df..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'ChangeLog'

#
#
# patch "ChangeLog"
#  from [032614fe128da6d74ed0791c9ad72d7c21198a71]
#    to [28b285fc7dd7ab59bf95ee10a08a0533f12f9d4c]
#
============================================================
--- ChangeLog	032614fe128da6d74ed0791c9ad72d7c21198a71
+++ ChangeLog	28b285fc7dd7ab59bf95ee10a08a0533f12f9d4c
@@ -1,5 +1,11 @@ 2003-09-27  graydon hoare  <graydon@pobo
 2003-09-27  graydon hoare  <graydon@pobox.com>

+	* diff_patch.cc: Rework conflict detection.
+	* rcs_import.cc: Remove some pointless slowness.
+	* monotone.spec: Install info files properly.
+
+2003-09-27  graydon hoare  <graydon@pobox.com>
+
 	* AUTHORS, NEWS, configure.ac: Update for 0.5 release.
 	* monotone.texi: Various updates.
 	* xdelta.cc (compute_delta): Fix handling of empty data.