allskonar

Two things in my .bash_history today.

file merging and resolution conflict tools

vim has an answer for every problem vimdiff file1.txt file2.txt

FileMerge looks promizing also

the ever lasting quest for decent terminal

the screen app. see http://jmcpherson.org/screen.html