Merge branch 'jm/mergetool-submodules'
authorJunio C Hamano <redacted>
Wed, 4 May 2011 22:51:23 +0000 (15:51 -0700)
committerJunio C Hamano <redacted>
Wed, 4 May 2011 22:51:23 +0000 (15:51 -0700)
* jm/mergetool-submodules:
  mergetool: Teach about submodules


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