index 24217a5f6875293bee9d3550aa505bfd0fdae46a..e1a4e4f1f68f1a4c1f688f9f02f4fe6eb553335b 100644 (file)
--- a/README
+++ b/README
BlackBox diffutils
--------------------
-Clone of diff and patch utilites from *nix for BlackBox and its binary document format.
+Clone of diff, patch and diff3 utilites from *nix for BlackBox and its binary document format.
Building
--------------------
--------------------
See sources. Documentation not writed yet.
+Coomand DevDiff.Compare compare texts from two windows (link DevSearchCompare).
Command DevDiff.CompareThis compare two files and produce patch in unified diff format.
Command DevDiff.PatchThis read patch in unified diff format and apply changes from it.
+Command DevDiff.MergeThis read three files and do thee-way merge.
Current state
--------------------