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)
commit59b2389c324dbbb335bd3375d950433b600eee90
tree3bebaa5ac1c31664d0a3f140c8c4d5a863b6cb59
parent7ab576ce2dc8bb7e87c8fa2c945e61345308d03d
parentff7f089ed1064b6a10e958bf405f828226262424
Merge branch 'jm/mergetool-submodules'

* jm/mergetool-submodules:
  mergetool: Teach about submodules