Merge branch 'th/mergetools-deltawalker'

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

Junio C Hamano committed Mar 16, 2012 at 08:24 UTC 0987145dd3d11373270c1e0cfbd449f2c6c834c9

No changes.