![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 6 Mar 2012 22:53:07 +0000 (14:53 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 6 Mar 2012 22:53:07 +0000 (14:53 -0800) | ||
| commit | f4464a3b7c9319011acf7b813b0217e244f4954e | |
| tree | 8be249b9189b9b6b6a2d687e1babce08832b1c6b | tree | snapshot |
| parent | 4b4ec3fc6480312515e1ec3d827c1308c00adc1e | commit | diff |
| parent | 284a126c3ef3dfedede9bc64df4cf3a24600dea5 | commit | diff |
Merge branch 'th/mergetools-deltawalker'
By Tim Henigan
* th/mergetools-deltawalker:
mergetools: add a plug-in to support DeltaWalker
By Tim Henigan
* th/mergetools-deltawalker:
mergetools: add a plug-in to support DeltaWalker