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)
commit26517de...245cc6332ffb80cf7747f6c211aa2e4d
treedfc1e28...f9e30d7f2d4f81257dbc826a1cfb4727copy hash to clipboard (tree)
parentc2ed29b...9b557b7bba8be147551cdd6e22fd743bcopy hash to clipboard (diff)
parent5fd8981...1ce2a243abf75192c9a55cb0a4e1ba80copy hash to clipboard (diff)
xdiff-interface.c