On Thursday 2009-02-12 06:29, Patrick McHardy wrote: > jengelh@xxxxxxxxxx wrote: >> 13 files changed, 108 insertions(+), 182 deletions(-) > > This diffstat I get looks quite different: > > 11 files changed, 73 insertions(+), 67 deletions(-) > > Any idea whats going on there? > I used git diff --stat instead of whatever merge outputs. $ git diff --stat nf/master..mdz/master [13 files, 108+, 182-] $ git rev-parse nf/master 8b7baebc93989106fd5d26b262d0ce191f8ef7c0 $ git rev-parse mdz/master 47a6fd9ec9891a8040eb8fd6db3c5012c1056061 HTH, Jan -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
