README

   1 BlackBox diffutils
   2 --------------------
   3
   4 Clone of diff and diff3 utilites from *nix for BlackBox and its binary Compound Document format.
   5
   6
   7 Commands
   8 --------------------
   9
  10 To use tools within Blackbox just compile DevDiff.
  11
  12 DiffUtils.Compare (guard TextCmds.FocusGuard)
  13
  14         Compare texts from two windows.
  15         You can directly replace DevSearch.Compare with it in Dev/Rsrc/Menus.odc.
  16
  17
  18 ^Q DiffUtils.CompareThis <oldfile> <newfile> [">" <outfile>]
  19
  20         Compare two files and produce patch in unified diff format.
  21
  22
  23 ^Q DiffUtils.MergeThis <my> <old> <your> [">" <outfile>]
  24
  25         Read three files and do three-way merge like diff3.
  26
  27
  28 Dedicated tool
  29 --------------------
  30
  31 You can read, create diffs and merge documents from command line using odctool.
  32 To build it, open DiffMain and execute commanders at the end of document.
  33 Call `odctool help` to learn how to use it.
  34
  35
  36 Integration with Git
  37 --------------------
  38
  39 It is possible to integrate three-way merge with git.
  40
  41 1. Open .git/config and add this lines:
  42
  43         [merge "odctool"]
  44                 name = BlackBox Compound Document merge driver
  45                 driver = /full/path/to/odctool merge -p %P -o %A %A %O %B
  46
  47 2. Open/create .git/info/attributes and add this line:
  48
  49         *.odc merge=odctool
  50
  51 Now when conflict occurs, it marked like diff3 directly in odc file.
  52 Checked not only text, but also views and formatting.
  53
  54
  55 Current state
  56 --------------------
  57
  58 This is NOT final version of subsustem Diff and odctool. It is NOT well tested, you are warned!
  59 Also, program and user interface are not stable yet, so it can be changed in future.