/* * Add some stuff in the left revision! * * This comment will be attached to the compilation unit. * We want to merge it textually, separately from all other merging. * * And add some stuff in the right revision! */ package se.kth.spork; /** * And this is the normal Javadoc comment. */ public class Cls { }