Andrew's git / gitweb.git / t/t4018/java-class-member-function
?
t / t4018 / java-class-member-functionon commit merge-recursive: do not look at the index during recursive merge (f309e8e)
   1public class Beer
   2{
   3        int special;
   4        public static void main(String RIGHT[])
   5        {
   6                System.out.print("ChangeMe");
   7        }
   8}