Merge branch 'th/mergetools-deltawalker'

By Tim Henigan * th/mergetools-deltawalker: mergetools: add a plug-in to support DeltaWalker

Junio C Hamano committed Mar 6, 2012 at 14:53 UTC f4464a3b7c9319011acf7b813b0217e244f4954e

No changes.