mergetool: Teach about submodules
authorJonathon Mah <me@JonathonMah.com>
Wed, 13 Apr 2011 10:00:48 +0000 (03:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2011 19:21:45 +0000 (12:21 -0700)
commitff7f089...d1064b6a10e958bf405f828226262424
treeb3bade0...5549198e3d1f1ac9f14312527e1ed3a7copy hash to clipboard (tree)
parentc3f6163...0b6e2cfae1422050c9607db1130cded0copy hash to clipboard (diff)
git-mergetool.sh
t/t7610-mergetool.sh