From d1d628782907aeb46fa9f0115669c5c11c014f09 Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Fri, 14 Dec 2018 23:22:38 +0300 Subject: [PATCH] Implemented three-way merge --- Dev/Mod/Diff.odc | Bin 23111 -> 32702 bytes README | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dev/Mod/Diff.odc b/Dev/Mod/Diff.odc index e12a6fdb60079a239a5906a25aaff3c9c9d8b0f4..aa95243369b5ff180723d90359cdde7ab261c78f 100644 GIT binary patch literal 32702 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 literal 23111 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 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 -------------------- -- 2.29.2