t / t4018 / css-colon-eolon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1RIGHT h1 {
   2color:
   3ChangeMe;
   4}