Merge branch 'fix'
authorJunio C Hamano <junkio@cox.net>
Wed, 5 Apr 2006 09:50:54 +0000 (02:50 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 5 Apr 2006 09:50:54 +0000 (02:50 -0700)
* fix:
  diff_flush(): leakfix.
  parse_date(): fix parsing 03/10/2006

1  2 
date.c
diff.c

diff --cc date.c
Simple merge
diff --cc diff.c
Simple merge