On 2009-04-09 10:27 (-0700), layer wrote:
> 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.
Maybe the following commands are helpful:
git diff --base
git diff --ours
git diff --theirs
Those options are not documented in git-diff(1), by the way.
--
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