t / t4018 / custom2-match-to-end-of-lineon commit t6036: add a failed conflict detection case: regular files, different modes (5d1daf3)
   1public class RIGHT_Beer
   2{
   3        int special;
   4        public static void main(String args[])
   5        {
   6                System.out.print("ChangeMe");
   7        }
   8}