Use more recent badiff, funcish-core