KDiff3

  • compares or merges two or three text input files or directories,
  • shows the differences line by line and character by character (!),
  • provides an automatic merge-facility and
  • an integrated editor for comfortable solving of merge-conflicts,
  • supports Unicode, UTF-8 and other codecs, autodetection via byte-order-mark “BOM”
  • supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
  • Printing of differences,
  • Manual alignment of lines,
  • Automatic merging of version control history ($Log$),
  • and has an intuitive graphical user interface.
  • Windows-Explorer integration Diff-Ext-for-KDiff3 – shell extension included in installer (originally by Sergey Zorin: see also Diff Ext)
  • KDE-Konqueror/Dolphin service menu plugin
  • Read what else is special in a short abstract (PDF).

KDiff3 – Homepage.

Nix/NixOS Home Page

Nix is a purely functional package manager. This means that it can ensure that an upgrade to one package cannot break others, that you can always roll back to previous version, that multiple versions of a package can coexist on the same system, and much more.

Nixpkgs is a large collection of packages that can be installed with the Nix package manager.

NixOS is a Nix-based Linux distribution. Thanks to Nix, it supports atomic upgrades, rollbacks and multi-user package management, and it has a declarative approach to system configuration management that makes it easy to reproduce a configuration on another machine.

Hydra is a Nix-based continuous build system.

Disnix is a Nix-based distributed service deployment system.

via Nix/NixOS Home Page.

UNIX tips: Learn 10 good UNIX usage habits

Adopt 10 good habits that improve your UNIX® command line efficiency — and break away from bad usage patterns in the process. This article takes you step-by-step through several good, but too often neglected, techniques for command-line operations. Learn about common errors and how to overcome them, so you can learn exactly why these UNIX habits are worth picking up.

via UNIX tips: Learn 10 good UNIX usage habits.