Merge branch 'jm/mergetool-submodules' into maint
authorJunio C Hamano <redacted>
Sun, 15 May 2011 22:57:16 +0000 (15:57 -0700)
committerJunio C Hamano <redacted>
Sun, 15 May 2011 22:57:16 +0000 (15:57 -0700)
* jm/mergetool-submodules:
  mergetool: Teach about submodules


Trivial merge
git clone https://git.99rst.org/PROJECT