layer <layer@xxxxxxxxx> writes: > 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. If you mean the resolution preview (that is you said "after merge with conflict", but what you meant was really "during a merge with conflict, I haven't recorded the final resolution with git-add yet"), I often find these two useful: What change does the other branch brought to my tree anyway? $ git diff HEAD -- that-file What did we do to the other branch? $ git diff MERGE_HEAD -- that-file -- 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