Implemented three-way merge

[bbdiff.git] / README

diff --git a/README b/README
index 24217a5f6875293bee9d3550aa505bfd0fdae46a..3adf02a4a58fd64ff0b104156e6a224c5b25f633 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 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
 --------------------
@@ -14,6 +14,7 @@ Usage
 See sources. Documentation not writed yet.
 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
 --------------------