From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Mar 2012 22:43:06 +0000 (-0700)
Subject: Merge branch 'jc/am-3-nonstandard-popt' into maint
X-Git-Tag: v1.7.9.4~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6;p=git.git

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

The code to synthesize the fake ancestor tree used by 3-way merge
fallback in "git am" was not prepared to read a patch created with
a non-standard -p<num> value.

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

b91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6