![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Mar 2012 22:43:06 +0000 (15:43 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 12 Mar 2012 22:43:15 +0000 (15:43 -0700) |
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
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
| 1 | 2 | |||
|---|---|---|---|---|
| git-am.sh | patch | | diff1 | | diff2 | | blob | history |
| t/t4150-am.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-am.sh
Simple merge
diff --cc t/t4150-am.sh
Simple merge