Replace again GNU diff with BSD diff
After a firts failed attempt, BSD diff is now good enough to replace GNU diff.
Relnotes: yes