templatekw: fix consistency of diffstat with diff.merge
Previously, -T'{diffstat}' was giving stats from the diff against p1,
regardless of whether --config diff.merge=yes is set.
This was inconsistent with log --patch which is aware of that option.