moar
merge tool = opendiff (I thought it was before?)
turn off double-j = escape, not useful and confusing