Project JEDI Tools

Brought to you by: beckmi, dezipaitor, mthoma, obones, and 2 others

Commit [r26] Maximize Restore History

add some labels to the demo memos.

add support for diff after diff merges.
some speed optimizations in TStringsSimpleDiff.InternalAdd.

Authored by: outchy 2010-12-22

Browse code at this revision

Parent: [r25]

Child: [r27]

changed	/trunk/helpsync/Diff/Demos/DiffDemos.groupproj
changed	/trunk/helpsync/Diff/Demos/DiffMainUnit.dfm
changed	/trunk/helpsync/Diff/Demos/DiffMainUnit.pas
changed	/trunk/helpsync/Diff/Demos/Merge3MainUnit.dfm
copied	/trunk/helpsync/Diff/Demos/Merge3MainUnit.dfm -> /trunk/helpsync/Diff/Demos/MergeAfterMainUnit.dfm
changed	/trunk/helpsync/Diff/Demos/Merge3MainUnit.pas
copied	/trunk/helpsync/Diff/Demos/Merge3MainUnit.pas -> /trunk/helpsync/Diff/Demos/MergeAfterMainUnit.pas
added	/trunk/helpsync/Diff/Demos/MergeAfterDemo.dpr
added	/trunk/helpsync/Diff/Demos/MergeAfterDemo.dproj
added	/trunk/helpsync/Diff/Demos/MergeAfterDemo.res
changed	/trunk/helpsync/Diff/Demos/MergeMainUnit.dfm
changed	/trunk/helpsync/Diff/Demos/MergeMainUnit.pas
changed	/trunk/helpsync/Diff/SimpleDiff.pas

/trunk/helpsync/Diff/Demos/DiffDemos.groupproj Diff Switch to side-by-side view

/trunk/helpsync/Diff/Demos/DiffMainUnit.dfm Diff Switch to side-by-side view

/trunk/helpsync/Diff/Demos/DiffMainUnit.pas Diff Switch to side-by-side view

/trunk/helpsync/Diff/Demos/Merge3MainUnit.dfm Diff Switch to side-by-side view

/trunk/helpsync/Diff/Demos/Merge3MainUnit.dfm to /trunk/helpsync/Diff/Demos/MergeAfterMainUnit.dfm

File was copied.

/trunk/helpsync/Diff/Demos/Merge3MainUnit.pas Diff Switch to side-by-side view

/trunk/helpsync/Diff/Demos/Merge3MainUnit.pas to /trunk/helpsync/Diff/Demos/MergeAfterMainUnit.pas

File was copied.

/trunk/helpsync/Diff/Demos/MergeAfterDemo.dpr Diff Switch to side-by-side view

/trunk/helpsync/Diff/Demos/MergeAfterDemo.dproj Diff Switch to side-by-side view

/trunk/helpsync/Diff/Demos/MergeAfterDemo.res

Binary file was added.

/trunk/helpsync/Diff/Demos/MergeMainUnit.dfm Diff Switch to side-by-side view

/trunk/helpsync/Diff/Demos/MergeMainUnit.pas Diff Switch to side-by-side view

/trunk/helpsync/Diff/SimpleDiff.pas Diff Switch to side-by-side view