Is there a way to change the output format? I find that "||||||| merged common ancestor" to be very noisy, visually.