From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 20 May 2012 22:45:35 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.11-rc0~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adc7052bb6e737cec0c6702f8dde259540eab672;p=thirdparty%2Fgit.git

Merge branch 'maint'

By Jens Lehmann (1) and Johannes Sixt (1)
* maint:
  Consistently use "superproject" instead of "supermodule"
  t3404: begin "exchange commits with -p" test with correct preconditions
---

adc7052bb6e737cec0c6702f8dde259540eab672