[tmoertel]

For those tricky situations, there's "sledgehammer and review" and the second-order git-diff trick:

https://blog.moertel.com/posts/2013-02-18-git-second-order-d...