From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 15 May 2011 22:57:16 +0000 (-0700)
Subject: Merge branch 'jm/mergetool-submodules' into maint
X-Git-Tag: v1.7.5.2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ab02095ccdadbd819bf6e8c9aac5ecb6c03c7916?ds=inline;hp=--cc

Merge branch 'jm/mergetool-submodules' into maint

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

ab02095ccdadbd819bf6e8c9aac5ecb6c03c7916