Using a comparison app does make it easier. but I do it was possible to have marlin be able to just keep the config file and swap out all the other files when doing an upgrade.
I realize this makes it difficult when you are changing variable names for features / settings