Menu ▾ ▴

Commit [r24]  Maximize  Restore  History

"Mine-their" merge support in SimpleDiff.pas.

New demo for "mine-their" diff merging.

outchy 2010-12-21

Browse code at this revision

Parent: [r23]

Child: [r25]

changed /trunk/helpsync/Diff/Demos/DiffDemos.groupproj
added /trunk/helpsync/Diff/Demos/Merge3Demo.dpr
added /trunk/helpsync/Diff/Demos/Merge3Demo.dproj
added /trunk/helpsync/Diff/Demos/Merge3Demo.res
copied /trunk/helpsync/Diff/Demos/MergeMainUnit.dfm -> /trunk/helpsync/Diff/Demos/Merge3MainUnit.dfm
copied /trunk/helpsync/Diff/Demos/MergeMainUnit.pas -> /trunk/helpsync/Diff/Demos/Merge3MainUnit.pas
changed /trunk/helpsync/Diff/SimpleDiff.pas
/trunk/helpsync/Diff/Demos/DiffDemos.groupproj Diff Switch to side-by-side view
Loading...
/trunk/helpsync/Diff/Demos/Merge3Demo.dpr Diff Switch to side-by-side view
Loading...
/trunk/helpsync/Diff/Demos/Merge3Demo.dproj Diff Switch to side-by-side view
Loading...
/trunk/helpsync/Diff/Demos/Merge3Demo.res
Binary file was added.
/trunk/helpsync/Diff/Demos/MergeMainUnit.dfm to /trunk/helpsync/Diff/Demos/Merge3MainUnit.dfm
File was copied.
/trunk/helpsync/Diff/Demos/MergeMainUnit.pas to /trunk/helpsync/Diff/Demos/Merge3MainUnit.pas
File was copied.
/trunk/helpsync/Diff/SimpleDiff.pas Diff Switch to side-by-side view
Loading...
MongoDB Logo MongoDB