t / t5100 / info0006on commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: a commit.
   4Date: Fri, 9 Jun 2006 00:44:16 -0700
   5