2 and 3-way diff/merge tool
TkDiff is a graphical 2 and 3-way diff/merge tool.
- Developed at devel:tools
- Sources inherited from project openSUSE:Factory
-
2
derived packages
- Download package
-
Checkout Package
osc -A https://api.opensuse.org checkout openSUSE:Factory:Rebuild/tkdiff && cd $_ - Create Badge
Refresh
Refresh
Source Files
| Filename | Size | Changed |
|---|---|---|
| README.SUSE | 0000001881 1.84 KB | |
| tkdiff-4-3-5.zip | 0000164431 161 KB | |
| tkdiff.changes | 0000004784 4.67 KB | |
| tkdiff.spec | 0000001499 1.46 KB |
Revision 20 (latest revision is 24)
Dominique Leuenberger (dimstar_suse)
accepted
request 640096
from
Martin Pluskal (pluskalm)
(revision 20)
- Use variables for version handling
- Update dependencies
- Update to 4.3.5
* New Diff Dialog now allows browsing for files OR directories
* 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
Comments 0