From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Mar 2026 21:36:55 +0000 (-0700)
Subject: Merge branch 'lp/diff-stat-utf8-display-width-fix'
X-Git-Tag: v2.54.0-rc0~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e757df82af5e9283fec2ff54d1e0eec2662c623c;p=thirdparty%2Fgit.git

Merge branch 'lp/diff-stat-utf8-display-width-fix'

"git log --graph --stat" did not count the display width of colored
graph part of its own output correctly, which has been corrected.

* lp/diff-stat-utf8-display-width-fix:
  t4052: test for diffstat width when prefix contains ANSI escape codes
  diff: handle ANSI escape codes in prefix when calculating diffstat width
---

e757df82af5e9283fec2ff54d1e0eec2662c623c