On 01/28/2013 02:10, Kevin Oberman wrote: > You don't by any chance have a mergemaster.rc in /etc or > .mergemasterrc in $HOME? > Duh... I'll go stand in the corner for the next 37 years. Cheers Michiel