From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Fri, 14 Dec 2018 20:22:38 +0000 (+0300)
Subject: Implemented three-way merge
X-Git-Url: https://deadsoftware.ru/gitweb?p=bbdiff.git;a=commitdiff_plain;h=d1d628782907aeb46fa9f0115669c5c11c014f09

Implemented three-way merge
---

diff --git a/Dev/Mod/Diff.odc b/Dev/Mod/Diff.odc
index e12a6fd..aa95243 100644
Binary files a/Dev/Mod/Diff.odc and b/Dev/Mod/Diff.odc differ
diff --git a/README b/README
index 24217a5..3adf02a 100644
--- 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
 --------------------