Skip to content

templatekw: fix consistency of diffstat with diff.merge

Euxane TRAN-GIRARD requested to merge topic/default/p_diffmerge_diffstat_fix_consistency into branch/default

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.

Merge request reports