APTX wrote: In theory it's something that will alow you to easily update your board even if it has mods installed.
Surely if you change things enough its still going to confuse any diff system.
What happens if the changed line is one that you have also changed, how is it going to resolve that?