![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 4 May 2011 22:51:23 +0000 (15:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 4 May 2011 22:51:23 +0000 (15:51 -0700) | ||
| commit | 59b2389c324dbbb335bd3375d950433b600eee90 | |
| tree | 3bebaa5ac1c31664d0a3f140c8c4d5a863b6cb59 | tree | snapshot |
| parent | 7ab576ce2dc8bb7e87c8fa2c945e61345308d03d | commit | diff |
| parent | ff7f089ed1064b6a10e958bf405f828226262424 | commit | diff |
Merge branch 'jm/mergetool-submodules'
* jm/mergetool-submodules:
mergetool: Teach about submodules
* jm/mergetool-submodules:
mergetool: Teach about submodules