t / t4100 / t-apply-9.expecton commit rerere: teach rerere to handle nested conflicts (4af3220)
   1 t/t4100-apply-stat.sh |    2 +-
   2 1 file changed, 1 insertion(+), 1 deletion(-)