From: Mark Wooding Date: Mon, 27 Feb 2006 12:48:15 GMT Subject: [PATCH 0/2] combine-diff consistency fixes Message-ID: <20060227124815.25144.83101.stgit@metalzone.distorted.org.uk> The output of git diff-tree --cc on a merge is not consistent with its output for a normal commit. In particular: * the index lines on a combined diff are abbreviated even if --full-index is given, and * the headers on a combined diff are not null terminated, even if -z is given. For example, run git-diff-tree --cc -z --full-index f0b0af1b04f558b684cae2a3b805ca4bab84d45f -- [mdw]