opensource/loki
1
0
Fork 0
mirror of https://github.com/grafana/loki.git synced 2026-03-13 09:33:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
6e6fe3066352419e7c20ffed02e7cb6c4ef4880b
loki/.gitattributes
Karsten Jeschkies 67a5c19b17 Enable merge union strategy for CHANGELOG.md. (#5102) 
Summary:
This provides a reasonable automatic merge strategy for changelog
entries. No more merge conflicts on changelog changes.
2022-01-11 22:18:54 +02:00

2 lines
25 B
Plaintext
Raw Blame History

CHANGELOG.md merge=union
Reference in New Issue View Git Blame Copy Permalink