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


Trivial merge