t / t4018 / custom2-match-to-end-of-lineon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1public class RIGHT_Beer
   2{
   3        int special;
   4        public static void main(String args[])
   5        {
   6                System.out.print("ChangeMe");
   7        }
   8}