summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-03-12 15:43:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-12 15:43:15 -0700
commitb91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6 (patch)
treeddece8bdb532d56cf5bbfd8cc6ef102328e8d456 /t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side
parentt5704: fix nonportable sed/grep usages (diff)
parenttest: "am -3" can accept non-standard -p<num> (diff)
downloadtgif-b91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6.tar.xz
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
Diffstat (limited to 't/t4013/diff.diff-tree_--pretty_--patch-with-stat_side')
0 files changed, 0 insertions, 0 deletions