I've always used xxdiff to do my config merging but I just took X off my server so I'm no longer able to do that. The thought of merging through a terminal terrified me but I've managed to make it fairly painless. This is what I changed my settings to... pager="cat" diff_command="diff -N --side-by-side -W $(tput cols) %file1 %file2" using_editor=0 merge_command="sdiff -w $(tput cols) -s -o %merged %orig %new" In order for $(tput cols) to work, I had to stick eval in front of the lines where diff_command and merge_command are executed. Could you do that by default please! P.S. Where it says "Merging ${file} and ${ofile}" I think these should be the other way around since sdiff displays the original file on the left and the updated file on the right by default. That message is counterintuitive.
in r3935
This has been released in 2.1.1_pre3-r2.
