From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Jul 2025 19:02:34 +0000 (-0700)
Subject: Merge branch 'ac/auto-comment-char-fix'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d345ceda32412d8575234ad8b959d9f598b00a6e;p=thirdparty%2Fgit.git

Merge branch 'ac/auto-comment-char-fix'

"git commit" that concludes a conflicted merge failed to notice and remove
existing comment added automatically (like "# Conflicts:") when the
core.commentstring is set to 'auto'.

* ac/auto-comment-char-fix:
  config: set comment_line_str to "#" when core.commentChar=auto
  commit: avoid scanning trailing comments when 'core.commentChar' is "auto"
---

d345ceda32412d8575234ad8b959d9f598b00a6e