3 make a patch with svn and have a look at that.
Then look what the differences are between hg and svn patch and then make the changes by hand.
Here's a svn patch of your work, to apply against official trunk r27967.
ship collision avoidance.patch [11.25 KiB]
Downloaded 20 times
The setting is included in it. Also, I included a savegame conversion, and a save version bump.
I removed this line. Never seen in any of the other settings. Not sure what is it for.
patxname = ""ship_collision_avoidance.vehicle.ship_collision_avoidance""