From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 May 2011 22:51:23 +0000 (-0700)
Subject: Merge branch 'jm/mergetool-submodules'
X-Git-Tag: v1.7.6-rc0~119
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=59b2389c324dbbb335bd3375d950433b600eee90;p=git.git

Merge branch 'jm/mergetool-submodules'

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

59b2389c324dbbb335bd3375d950433b600eee90