From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Mar 2012 15:24:19 +0000 (-0700)
Subject: Merge branch 'th/mergetools-deltawalker'
X-Git-Tag: v1.7.10-rc2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0987145dd3d11373270c1e0cfbd449f2c6c834c9;p=git.git

Merge branch 'th/mergetools-deltawalker'

* th/mergetools-deltawalker:
  Documentation/difftool: add deltawalker to list of valid diff tools
---

0987145dd3d11373270c1e0cfbd449f2c6c834c9