Is there anyway to use vimdiff with mergemaster. Or is it safe to just see what files are different in etc, and vimdiff them manually? I see /var/tmp/temproot has a lot more in it that I was expecting. I thought it would be just etc.