tree 3bebaa5ac1c31664d0a3f140c8c4d5a863b6cb59
parent 7ab576ce2dc8bb7e87c8fa2c945e61345308d03d
parent ff7f089ed1064b6a10e958bf405f828226262424
author Junio C Hamano <gitster@pobox.com> 1304549483 -0700
committer Junio C Hamano <gitster@pobox.com> 1304549483 -0700

Merge branch 'jm/mergetool-submodules'

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