#if confuse the block toool
If a #if block exists before a modified function, the code within the #if is also grabbed when you view a diff. It is only grabbed on the destination file.
This burned me severely in the U-Boot code.
Colin Young commented
This is going to become a bigger issue as .Net 5/DNX core starts to be adopted. It would be really nice to see conditional compilation blocks handled as nicely as the rest of the code is.