From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Mar 2012 07:35:12 +0000 (-0800)
Subject: Merge branch 'jc/am-3-nonstandard-popt'
X-Git-Tag: v1.7.10-rc0~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=250f0a074a0bf7194c6a99c481211b0c9d8590a7;p=git.git

Merge branch 'jc/am-3-nonstandard-popt'

* jc/am-3-nonstandard-popt:
  test: "am -3" can accept non-standard -p<num>
  am -3: allow nonstandard -p<num> option
---

250f0a074a0bf7194c6a99c481211b0c9d8590a7