I was resolving merge conflicts for a modest XML file of ~2500 lines. I was surprised when it ran out of memory; looking at diffFiles.sh I was surprised to see that the memory was limited to 512 MB (-Xmx512m). Shouldn’t that default to a significantly higher value for the 64-bit install of Oxygen? I believe most of the vmoptions files set a default memory of ~4 GB.

I changed my local copy but I know the next minor update will overwrite my changes.

Thanks,

Lee