Merge branch 'ds/init-diffstat-width'

Code clean-up. * ds/init-diffstat-width: diff --stat: set the width defaults in a helper function