From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 11 Apr 2009 00:47:33 GMT
Subject: Re: git diff after merge (with conflict)
Message-ID: <7vvdpcnhi2.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <324.1239298063@relay.known.net>

layer <layer@known.net> 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