Code

Merge branch 'th/mergetools-deltawalker'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:07 +0000 (14:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:07 +0000 (14:53 -0800)
commitf4464a3b7c9319011acf7b813b0217e244f4954e
tree8be249b9189b9b6b6a2d687e1babce08832b1c6b
parent4b4ec3fc6480312515e1ec3d827c1308c00adc1e
parent284a126c3ef3dfedede9bc64df4cf3a24600dea5
Merge branch 'th/mergetools-deltawalker'

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