Merge branch 'lt/dirstat'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2008 02:14:53 +0000 (18:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2008 02:14:53 +0000 (18:14 -0800)
commita2de3a17faed90c0a7d35e3f48470549b284c4ec
tree47c8259f38d84cdebdc1fd7b0cee83cfacea8c78
parente38f892d1832977511c4e7c82204c7f94c3a3232
parent2b0b551d7662a4246ed55b6a7029ba3caa65cf98
Merge branch 'lt/dirstat'

* lt/dirstat:
  diff --dirstat: saner handling of binary and unmerged files
  Add "--dirstat" for some directory statistics
diff.c
diff.h