tkdiff Code

* Further improved newDiff dialog now permits browsing to an Ancestor file
- additionally it can be specified as a SCM revision instance, perhaps
- from distinct branches (presuming each WC knows the branch it represents)
* Now accepts entering 2 FileSpec + 2 Revisions where Filespecs are NOT the
- same allowing comparisons of distinct branches (for branch sensitive WCs)
* 3way collisions now highlight within the dropdown list (a location aid)
* The GUI txtwin labels now tooltip the REAL filename+modtimes (no tmpfils)
* MacOS X prevented from using ASYNC due to Aqua non-support for msg window
* Fixed missing usage of CDR-specific preferences within all Info displays
* Updated help on new input formats, 3way strategies, and PWD implications

* Improved newDiff dialog now permits browsing to Files OR Directories
- additionally it and browsers now stack above each other properly
- And now agrees w/help stating that "More" options UNSET when closed
* Repaired crash when Lnum/Chgbar are both OFF and 3way diff is/has run
* Map color pref chgs now WORK in the current session (besides 'save')
* All Info canvases now use 'currtag' prefs as intended (was ignoring)
* Transparent (internal) conversions to recent (Tcl8.5) coding techniques
- use of 'lassign' instead of 'foreach ... {}' hack
- use of 'apply' to manufacture anonymous event handler
- greater use of '{*}' list expansion style instead of 'eval'
* minor typos, safer internal constructs, consolidations, plus more uniformity

forgot to commit the Changelog

Emergency fix for corrupted Merge output from Split/Combine

* CRITICAL bug that MIGHT corrupt merge results (from Split/Combine)
by embedding extra copies of adjacent lines was eliminated.
* ReIMPLEMENTED the 3way diff support to properly assign merge sides
- Initial choices are now chosen to preserve ancestral modifications
- Markers denoting lines contributing to any ancestor-based decision
making are now displayed when run in 3way mode.
- The 'predominate' merge choice default (ie. users choice of side)
is NOW always subordinate to any ancestor-derived choices
- "Simple" collision resolutions can result in its highlight removal
This includes 'picking' a side, or possibly by Splitting the region
- Provided status msgs (to a popup), in lieu of a busy cursor, at pgm
startup w/SCM use to account for potential network latency delay
- Help info refined to describe 3way support, displays & latency
* Random bugs repaired
- Collision color in the DiffMap now honors its preference value
- The DiffMap is redrawn as needed for Split/Combine and/or collisions
- Misleading (inactive) filelist per-file 'menu accelerators' removed
- Avoids crash (chooses line 1) when no CDR exists and invoking Editor
- Report Save-as filename browser was lacking users filetype choices

"tag_copy_by_TkSVN"

"tag_copy_by_TkSVN"

"tags_directory_path_by_TkSVN"

Tag 4.3.1 release r122

"Removed_using_TkSVN"