From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 29 Jan 2012 21:18:52 +0000 (-0800)
Subject: Merge branch 'pw/p4-view-updates'
X-Git-Tag: v1.7.10-rc0~144
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1082fb22b236201ea71fcf5e262d48796992fe72;p=git.git

Merge branch 'pw/p4-view-updates'

* pw/p4-view-updates:
  git-p4: add tests demonstrating spec overlay ambiguities
  git-p4: adjust test to adhere to stricter useClientSpec
  git-p4: clarify comment
  git-p4: fix verbose comment typo
  git-p4: only a single ... wildcard is supported
---

1082fb22b236201ea71fcf5e262d48796992fe72