Merge branch 'jc/diff-stat'
authorJunio C Hamano <junkio@cox.net>
Sun, 1 Oct 2006 04:29:18 +0000 (21:29 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 1 Oct 2006 04:29:18 +0000 (21:29 -0700)
commitdd0c367e5e1358539bdd11c3a474bb6792504d30
tree017500fe3b098f45aef29f46691bc9b6a985b4f8
parent99692dc213482116f237ea58965b0ceef3827147
parent3ed74e608a69ce0f10bfad2e4ef6cf99eec04613
Merge branch 'jc/diff-stat'

* jc/diff-stat:
  diff --stat: ensure at least one '-' for deletions, and one '+' for additions
  diff --stat=width[,name-width]: allow custom diffstat output width.
  diff --stat: color output.
  diff --stat: allow custom diffstat output width.
diff.c
diff.h