Merge branch 'rs/maint-diff-fd-leak' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 26 Dec 2010 19:18:39 +0000 (11:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 26 Dec 2010 19:18:39 +0000 (11:18 -0800)
* rs/maint-diff-fd-leak:
  close file on error in read_mmfile()

1  2 
xdiff-interface.c

Simple merge