Skip to content
Snippets Groups Projects
Commit 9ff3d539 authored by Euxane TRAN-GIRARD's avatar Euxane TRAN-GIRARD
Browse files

templatekw: fix inconsistency 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.
parent d6e5bec5
No related branches found
No related tags found
1 merge request!705templatekw: fix consistency of diffstat with diff.merge
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment