From: layer <layer@known.net>
Date: Thu, 09 Apr 2009 17:27:43 GMT
Subject: git diff after merge (with conflict)
Message-ID: <324.1239298063@relay.known.net>

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