I think the Javadoc should also clarify that not only are we dealing with RawText objects, but that its a line-oriented file with LF being used as the line delimiters when producing conflict regions.

This is good enough for most uses, but if someone comes along and wants to do a different merge function, they might be tempted to use this code until they start to discover our hidden LF assumptions.  We should be a bit more clear about that up front in the docs.