Commits

Author Commit Message Labels Comments Date
bitsquid
No, it seems deleting the files is actually what you should do... hmm.
bitsquid
Removed file delete - bad choice... must be some other way of marking conflicts resolved in subversion.
bitsquid
Remove merge source files after successful merge.
bitsquid
Enforce creation of richTextObject handles. This is needed because otherwise the SelectionBackColor does not get set in some circumstances.
bitsquid
Better formatting for null objects.
bitsquid
More documentation.
bitsquid
Added documentation.
bitsquid
Added documentation for DiffVisualForm.cs.
bitsquid
Utilities for installing merge and diff tools for standard bitsquid file formats and TortoiseSVN.
bitsquid
Prevent scroll recursion.
bitsquid
Previous Difference and Next Difference implemented for merge view.
bitsquid
Basic merge interface in place.
bitsquid
Renamed DiffForm to TextForm.
bitsquid
If there are adjacent diff-lines... only create a single entry in the array of diff-lines.
bitsquid
Reorganized classes into separate files.
bitsquid
Initial checkin.