Desktop apps

[Michael ODonnell]

> A decent file comparison and merge tool.

tkdiff may not be exactly what you're looking
for, but it's still pretty darned cool...