Code

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)
* lt/dirstat:
  diff --dirstat: saner handling of binary and unmerged files
  Add "--dirstat" for some directory statistics

1  2 
diff.c
diff.h

diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge