Andrew's git / gitweb.git / diff
?
Merge branch 'th/mergetools-deltawalker'
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Mar 2012 15:24:19 +0000 (08:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Mar 2012 15:24:20 +0000 (08:24 -0700)
* th/mergetools-deltawalker:
Documentation/difftool: add deltawalker to list of valid diff tools

Trivial merge