refactored diff3 merge result printing