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

Junio C Hamano committed Mar 4, 2012 at 23:35 UTC 250f0a074a0bf7194c6a99c481211b0c9d8590a7

No changes.