Merge branch 'jc/combine-diff-callback'

* jc/combine-diff-callback: combine-diff: support format_callback

Junio C Hamano committed Aug 28, 2011 at 21:15 UTC e78f8291436753d98829f32cf5308fd99d59971b

No changes.