Is there some way to get regular unified diff behavior instead of the combined diff? For certain files (like ChangeLog's) the combined diff format after a merge is *very* confusing. Thanks. Kevin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html