Download Latest Version
tkdiff-5-7.zip (290.2 kB)
Get an email when there's a new version of tkdiff
| Name | Modified | Size | Downloads / Week |
|---|---|---|---|
| Parent folder | |||
| SFreadme.md | 2018-08-05 | 2.1 kB | |
| tkdiff-4-3-5.zip | 2018-08-05 | 164.4 kB | |
| Totals: 2 Items | 166.5 kB | 1 | |
V 4.3.5 (08/08/2018):
- New Diff Dialog now allows browsing for files OR directories
- with the Ancestor file also permitted to derive from an SCM
- additionally it and browsers now stack above each other properly
- Tool arguments now permit cross-branch SCM comparison specification
- Ability to view Ancestorfile also denotes 3way mode is active
- 3-way collisions now findable via toolbar dropdown list highlights
- Textwin labels now tooltip the name & modtime of any NON-temp file
- Builtin editor now provides Line numbers
- Recent new color preference settings repaired to "apply" correctly
- Crash fixed when 3-way diff was active and Lnums & Chgbars are OFF
- Pre-startup latency msg feature now OFF (MacOS X only) stops Crash
- Repaired Lnums,etc. to use CDR preference settings when appropriate
This release removes various constraints associated with obtaining the files to compare and particularly toward specifying an Ancestor file for 3-way merging. There is greater feedback and additional assistance features for help in resolving conflicts throughout the merge process. Lingering GUI faults from recent past releases have been identified and repaired. Extra time was invested to help ensure greater stability and consistent results. New help topics were added to aid understanding in using TkDiff effectively. Note the specific feature loss for MacOS X users is due to deficiencies in the Aqua support on that platform, but does not degrade TkDiff itself.
Starting with V4.3, nearly 46% of the code has been refactored. We invite any one seeking deeper insight into how the tool now functions to inquire at the TkDiff Discussion forum: https://sourceforge.net/p/tkdiff/discussion
The provided zipfile will unzip to its own subdirectory named "tkdiff-4-3-5" containing a README.txt file (having installation instructions), a Changelog file to highlight current (and past) modifications, the actual tkdiff Tcl script, and the (required) copy of the GNU License. We hope you find this new version both useful and reliable.