| commit | 167c74f4ddc054a6323f40ca75fc398162c170a9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Mar 2012 22:37:07 +0000 (5 14:37 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Mar 2012 22:37:07 +0000 (5 14:37 -0800) | ||
| tree | fff9aab2dd07c29311d3a84c24c566c8f32dc11b | treesnapshot (tar.gz zip) |
| parent | 114e6b2d0691cf9257527538eb160f3dc2a66c18 | commitdiff |
| parent | 284a126c3ef3dfedede9bc64df4cf3a24600dea5 | commitdiff |
Merge branch 'th/mergetools-deltawalker' into next
* th/mergetools-deltawalker:
mergetools: add a plug-in to support DeltaWalker
* th/mergetools-deltawalker:
mergetools: add a plug-in to support DeltaWalker