DEADSOFTWARE

Implemented three-way merge
[bbdiff.git] / README
1 BlackBox diffutils
2 --------------------
4 Clone of diff, patch and diff3 utilites from *nix for BlackBox and its binary document format.
6 Building
7 --------------------
9 Just compile module DevDiff.
11 Usage
12 --------------------
14 See sources. Documentation not writed yet.
15 Command DevDiff.CompareThis compare two files and produce patch in unified diff format.
16 Command DevDiff.PatchThis read patch in unified diff format and apply changes from it.
17 Command DevDiff.MergeThis read three files and do thee-way merge.
19 Current state
20 --------------------
22 This is NOT final version of module DevDiff. It is NOT well tested, but it works. You are warned!
23 Todo list see at the and of sources.