Menu

Code Commit Log


Commit Date  
[r122] by vampm

Enhanced features and preference display/edit for flexibility/speed
* Multiple Diff suppression features now supported
- Can request suppression of diffs involving only empty lines
- Additionally, may also suppress diffs of RegExp-matched lines
- both features are retained/manipulated as user preferences and
may also be specified from the command line
- suppresion modes work REGARDLESS of the Diff engine in use
* New prefs added, exposing more existing configuration settings
- A preferred merge choice default (ie. initial choice of side)
provided as both a commandline and preferences setting
- Colors representing diff region categories in the map and
the interim CDR color used during Split/Combine interaction
* A builtin interactive color selector for tuning above colors
* builtin (default) editor now positions to current CDR line
* avoids RE-highlighting unless pertinent values were changed
* (internal upgrade of combobox widget from V2.2.2 to V2.3)
* Another extensive update to the online help to explain it all

2018-06-25 19:51:38 Tree
[r121] by vampm

Provided a catchall commandline error msg (should never occur) to avoid crashing
Inline-diff computation now runs faster (implementation tuning)

2018-06-13 03:12:31 Tree
[r120] by dorothyr

Bug #55 "tkdiff -conflict FILE" invocation doesn't work

2018-06-08 14:16:58 Tree
[r119] by dorothyr

Explain how to use it on Windows and MacOS.

2018-06-06 02:26:41 Tree
[r118] by dorothyr

"tag_copy_by_TkSVN"

2018-06-05 20:53:53 Tree
[r117] by dorothyr

Merge from r116

2018-06-05 20:51:33 Tree
[r116] by vampm

Repaired missing Wheel scrolling over merge-preview Info window

2018-06-05 13:55:27 Tree
[r115] by vampm

(Last) Minor behavioral refinements addressed
- Button-2 jump scrolling now works over the Map when zero diffs exist
- Misleading dead code removed related to map scrolling
- Help info on cmdline quoting rules refined

2018-06-04 18:32:16 Tree
[r114] by dorothyr

ipadx -1 on the merge window buttons makes it so that they get big enough for the whole text string to fit. This may have only been a problem on Windows and Mac.

OK I think I'm done now.

2018-05-31 03:34:00 Tree
[r113] by dorothyr

Work on Aqua UI some more. Reworked the Merge window a little so that the frames are properly configurable.

2018-05-31 02:11:15 Tree
Older >
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.