On Thursday 2009-02-12 06:46, Patrick McHardy wrote: >>>> 13 files changed, 108 insertions(+), 182 deletions(-) >>> 11 files changed, 73 insertions(+), 67 deletions(-) >>> >>> Any idea whats going on there? >> I used git diff --stat instead of whatever merge outputs. > > That gives the same (different) output for me. I just found out that `git diff --stat` is not the right thing to use, at least in its form that I did. With appropraite(?) measures, I do get the expected: 11 files changed, 73 insertions(+), 67 deletions(-) > I'll skip this pull, please send a new request (with or without Jamal's > patches, as you like) once you figured out where those differences are > coming from. Now please :) -- 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
