Putting back diffmerge.jar
Finally something that compiles for MERgE + Xtext 2.3.1