Merge branch 'jm/mergetool-submodules'
* jm/mergetool-submodules: mergetool: Teach about submodules
Junio C Hamano committed
May 4, 2011 at 15:51 UTC
59b2389c324dbbb335bd3375d950433b600eee90
No changes.
* jm/mergetool-submodules: mergetool: Teach about submodules
No changes.