Fixed conflict in generated source merge when using native eol-styles by allowing an optional CR before the LF ($ here did not work for some reason)

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6599 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/main/java/com/threerings/presents/tools/GeneratedSourceMerger.java

@@ -125,5 +125,5 @@ public class GeneratedSourceMerger
     }
 
     protected final Pattern _sectionDelimiter =
-        Pattern.compile(" *// GENERATED (\\w+) (START|END|DISABLED)\n");
+        Pattern.compile(" *// GENERATED (\\w+) (START|END|DISABLED)\r?\n");
 }