I actually just encountered this today. My changes, a large refactor, was trying to be reconciled with tweaks done before my refactor. Diffing mine against th

I actually just encountered this today. My changes, a large refactor, was trying to be reconciled with tweaks done before my refactor. Diffing mine against their's was gross. The first thing I wanted to see what their changes diffed against our ancestor looked like. However, in the end I didn't end up merging any code and I haven't yet been in a position where this has come up much. I just thought it was a funny coincidence I encountered this earlier today.