t / t4018 / java-class-member-functionon commit t6036: add a failed conflict detection case with submodule modify/modify (d4d1718)
   1public class Beer
   2{
   3        int special;
   4        public static void main(String RIGHT[])
   5        {
   6                System.out.print("ChangeMe");
   7        }
   8}