<<<<<< "/* HelloWorld */" public class HelloWorld { } >>>>>> "/* HelloWorld */" public class HelloWorld { /** * public static String world = "world"; * * @generated */ public static String world = "world"; /** * * * @generated */ /** * static String hello = "Hello"; * * @generated */ static String hello = "Hello"; /** * public static void main (String args []) {System.out.println (hello + ", " + world + "!");} * * @generated */ public static void main (String args []) { System.out.println (hello + ", " + world + "!"); } }