![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Aug 2011 04:15:33 +0000 (21:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Aug 2011 04:15:33 +0000 (21:15 -0700) | ||
| commit | e78f8291436753d98829f32cf5308fd99d59971b | |
| tree | 55d951dae236290f38f8888f2c44b0b9a04b89c0 | tree | snapshot |
| parent | 1b76df16d1e0f819af4e4766f7f621568571fd9f | commit | diff |
| parent | 25e5e2bf85c8a2c2c8945935267539940c11020d | commit | diff |
Merge branch 'jc/combine-diff-callback'
* jc/combine-diff-callback:
combine-diff: support format_callback
* jc/combine-diff-callback:
combine-diff: support format_callback
| combine-diff.c | diff1 | | diff2 | | blob | history |