From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Mar 2012 22:53:07 +0000 (-0800)
Subject: Merge branch 'th/mergetools-deltawalker'
X-Git-Tag: v1.7.10-rc0~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f4464a3b7c9319011acf7b813b0217e244f4954e;p=git.git

Merge branch 'th/mergetools-deltawalker'

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

f4464a3b7c9319011acf7b813b0217e244f4954e