Code

Merge branch 'jc/combine-diff-callback'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:15:33 +0000 (21:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:15:33 +0000 (21:15 -0700)
commite78f8291436753d98829f32cf5308fd99d59971b
tree55d951dae236290f38f8888f2c44b0b9a04b89c0
parent1b76df16d1e0f819af4e4766f7f621568571fd9f
parent25e5e2bf85c8a2c2c8945935267539940c11020d
Merge branch 'jc/combine-diff-callback'

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