Merge branch 'jm/mergetool-submodules' into maint
* jm/mergetool-submodules: mergetool: Teach about submodules
Junio C Hamano committed
May 15, 2011 at 15:57 UTC
ab02095ccdadbd819bf6e8c9aac5ecb6c03c7916
No changes.
* jm/mergetool-submodules: mergetool: Teach about submodules
No changes.