![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 15 May 2011 22:57:16 +0000 (15:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 15 May 2011 22:57:16 +0000 (15:57 -0700) | ||
| commit | ab02095ccdadbd819bf6e8c9aac5ecb6c03c7916 | |
| tree | 431cfce1fd42af6b7cce95abb26590c464ca476e | tree | snapshot |
| parent | 92b501f2a022b2de374737a79a96ea14f52fe3c9 | commit | diff |
| parent | ff7f089ed1064b6a10e958bf405f828226262424 | commit | diff |
Merge branch 'jm/mergetool-submodules' into maint
* jm/mergetool-submodules:
mergetool: Teach about submodules
* jm/mergetool-submodules:
mergetool: Teach about submodules