X-Git-Url: https://deadsoftware.ru/gitweb?p=bbdiff.git;a=blobdiff_plain;f=README;h=3adf02a4a58fd64ff0b104156e6a224c5b25f633;hp=e885fea72926ce49049b2258617116d2a9b87b4f;hb=d1d628782907aeb46fa9f0115669c5c11c014f09;hpb=fc245bb03479cf0e6a640822701377d7a8f0f16e diff --git a/README b/README index e885fea..3adf02a 100644 --- a/README +++ b/README @@ -1,9 +1,7 @@ -BlackBox Diff Utils +BlackBox diffutils -------------------- -Clone of diff and patch utilites from *nix for BlackBox and its binary document format. -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. +Clone of diff, patch and diff3 utilites from *nix for BlackBox and its binary document format. Building -------------------- @@ -14,11 +12,12 @@ 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 -------------------- This is NOT final version of module DevDiff. It is NOT well tested, but it works. You are warned! -The biggest problem is that Views not compared and always treated as different. -While applying patch tested only Views types. Todo list see at the and of sources.