Merge branch 'pr/3809'

diff --cc src/diff_stats.c
Simple merge

diff --cc tests/diff/format_email.c
Simple merge

diff --cc tests/diff/stats.c
Simple merge