Menu

Tools Commit Log


Commit Date  
[r28] by outchy

new Doc-o-Matic project file for JEDI include files.

2010-12-27 20:34:54 Tree
[r27] by outchy

For now the merge "diff before diff" is not supported, but it can be rewritten to "diff after diff" with no problem.

2010-12-23 14:25:07 Tree
[r26] by outchy

add some labels to the demo memos.
add support for diff after diff merges.
some speed optimizations in TStringsSimpleDiff.InternalAdd.

2010-12-22 14:52:35 Tree
[r25] by outchy

fixed arithmetic errors in element copies and index shifts.

2010-12-21 23:00:15 Tree
[r24] by outchy

"Mine-their" merge support in SimpleDiff.pas.
New demo for "mine-their" diff merging.

2010-12-21 21:51:42 Tree
[r23] by outchy

Merge support in SimpleDiff.pas.
New demo for diff merging (it adds the differences to the left source).

2010-12-21 15:30:28 Tree
[r22] by outchy

Renamed DiffDemo main form.
Changed the TStringSimpleDiff kind to TStringSimpleDiff flags, this change will make conflict handling a lot easier.

2010-12-21 15:07:03 Tree
[r21] by outchy

add MPL license.

2010-12-20 20:49:26 Tree
[r20] by outchy

New unit and demos to deal with TStrings-based diffs.

2010-12-20 19:55:42 Tree
[r19] by outchy

these info should not have been published.

2010-12-09 19:10:23 Tree
Older >
MongoDB Logo MongoDB