t / t4018 / fountain-sceneon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1EXT. STREET RIGHT OUTSIDE - DAY
   2
   3CHARACTER
   4You didn't say the magic phrase, "ChangeMe".