t / t4013 / diff.log_-SF_master_--max-count=0on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1$ git log -SF master --max-count=0
   2$