TKDIFF(1)

📦 version 8.2.3, in debian bookworm, debian trixie, ubuntu jammy, ubuntu noble, ubuntu questing, ubuntu resolute, ubuntu stonking

💖 NAME 💖

tkdiff — a graphical "diff" utility, bestie. That's the whole vibe. 👑

✨ SYNOPSIS ✨

okay so here's every way you can roll up on this program, no cap:

tkdiff

to interactively pick files. You don't gotta tell her anything, she'll let you go shopping for them yourself. 🛍️

tkdiff <file1> <file2>

to compare two files. The classic. The original. The main character energy. 🎀

tkdiff -conflict <file>

to merge a file with conflict markers generated by "merge" or "cvs", The file is split into two temporary files which you can then merge as usual. 😭 (conflict markers, my beloathed)

tkdiff <file>

to compare <file> with the most recent version checked into CVS/SCCS/RCS (checked for in that order). Yes bestie, that order, exactly that order, don't come for me. 💅

tkdiff -r <file>

to compare <file> with the most recent version checked in.

tkdiff -r<rev> <file>

to compare <file> with revision <rev> of <file>.

tkdiff -r<rev> -r <file>

to compare revision <rev> of <file> with the most recent version checked in.

tkdiff -r<rev1> -r<rev2> <file>

to compare revisions <rev1> and <rev2> of <file>. Two revs, one file, absolutely unhinged of you but go off. 🔥

🌸 DESCRIPTION 🌸

A graphical "diff" utility. Online help is available by hitting the "help" button. 🫶

not me telling you to just press the "help" button like it's a personality trait — but fr fr, it's right there, it's free, use it. ✨

👑 AUTHOR 👑

John Klassa <klassa@ipass.net> Warren Jones, Peter Brandstrom. legends, all three of them. 🌈

okay that's the whole page bestie, ty for coming to my ted talk 🦋

this one's from the General Commands Manual, stamped 1995/06/16 12:52:15 — yeah she's vintage, she's an icon, she's been slaying since before you were born 💅✨

📦 where this page comes from