]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b03646 d3b5832)
Merge branch 'pw/custom-conflict-marker-size-for-merge-related-docs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Apr 2025 20:50:17 +0000 (13:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Apr 2025 20:50:17 +0000 (13:50 -0700)
commit11e4c8cd9c14dbf9d561928a6ada5a79a3b6c17a
treea3f004ea1f5aeda5b76f6c91dd2a01269bd008b7tree
parent7b03646f85b6eb4c0f6e05ed4b235577d3969532commit | diff
parentd3b5832381c42ba3dfd79b18dea035bcc995b10acommit | diff
Merge branch 'pw/custom-conflict-marker-size-for-merge-related-docs'

"git-merge-file" documentation source, which has lines that look
like conflict markers, lacked custom conflict marker size defined,
which has been corrected..

* pw/custom-conflict-marker-size-for-merge-related-docs:
  merge-file doc: set conflict-marker-size attribute
Unnamed repository; edit this file 'description' to name the repository.