Merge branch 'jm/mergetool-submodules' into maint
commitab02095ccdadbd819bf6e8c9aac5ecb6c03c7916
authorJunio C Hamano <gitster@pobox.com>
Sun, 15 May 2011 22:57:16 +0000 (15 15:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 15 May 2011 22:57:16 +0000 (15 15:57 -0700)
tree431cfce1fd42af6b7cce95abb26590c464ca476e
parent92b501f2a022b2de374737a79a96ea14f52fe3c9
parentff7f089ed1064b6a10e958bf405f828226262424
Merge branch 'jm/mergetool-submodules' into maint

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