![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 16 Mar 2012 15:24:19 +0000 (08:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 16 Mar 2012 15:24:20 +0000 (08:24 -0700) | ||
| commit | 0987145dd3d11373270c1e0cfbd449f2c6c834c9 | |
| tree | d088652b6cce0bc844da014edf615a26847ecad3 | tree | snapshot |
| parent | c3117b21666f2a68aebd5fce0bcdc4ab705c299a | commit | diff |
| parent | 79e0fe634865462551cf3fcad25c9a595652e925 | commit | diff |
Merge branch 'th/mergetools-deltawalker'
* th/mergetools-deltawalker:
Documentation/difftool: add deltawalker to list of valid diff tools
* th/mergetools-deltawalker:
Documentation/difftool: add deltawalker to list of valid diff tools