bug fix

Fix:
use back "diff --strip-trailing-cr", -Z is not the correct option