X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=CHANGELOG;h=ee72b28fc3c9a81469055b432045fc00858e0009;hb=252d2081a943e847418dc677a4b95ebb2244ce4a;hp=0c65b7ced5ec290821bd65c46c3d48762f75ac6e;hpb=efc9ee6dcb946a247a45c7545471af21a530e0ff;p=idzebra-moved-to-github.git

diff --git a/CHANGELOG b/CHANGELOG
index 0c65b7c..ee72b28 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,22 @@
+<<<<<<< CHANGELOG
+--- 1.0a7 1997/5/16
+
+Fixed buffer-size problem in indexing.
+
+Added compression to temporary files for updating.
+
+Added phrase registers.
+
+Added dynamic mapping of search attribute to multiple termlists (ANY).
+
+||||||| 1.18
+=======
+Scan support in multiple databases/registers.
+
+>>>>>>> /tmp/T4a11432
+Configuration settings are case-insensitive and single dash (-)
+characters are ignored in comparisons.
+
 The index processing ignores empty files - warning given.
 
 New option to zebraidx (-V) displays version information.