Merge branch 'jc/am-3-nonstandard-popt' into next
commit62a6ddf54b0fda0c3cc0e609af05c6ce3503f51c
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 07:11:39 +0000 (26 23:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 07:11:39 +0000 (26 23:11 -0800)
tree27157e592ed24378aeb514fdf30c5a646aacc165
parent4ea21356d702d314988c50b52f8f378b1ccd5346
parenta61ba26a4725d4a93297305315587b92324baf0b
Merge branch 'jc/am-3-nonstandard-popt' into next

* jc/am-3-nonstandard-popt:
  test: "am -3" can accept non-standard -p<num>
t/t4150-am.sh