Merge branch 'rs/maint-diff-fd-leak' into maint
commit26517dea245cc6332ffb80cf7747f6c211aa2e4d
authorJunio C Hamano <gitster@pobox.com>
Sun, 26 Dec 2010 19:18:39 +0000 (26 11:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 26 Dec 2010 19:18:39 +0000 (26 11:18 -0800)
treedfc1e285f9e30d7f2d4f81257dbc826a1cfb4727
parentc2ed29b49b557b7bba8be147551cdd6e22fd743b
parent5fd898141ce2a243abf75192c9a55cb0a4e1ba80
Merge branch 'rs/maint-diff-fd-leak' into maint

* rs/maint-diff-fd-leak:
  close file on error in read_mmfile()
xdiff-interface.c