mirror of
https://github.com/jiangcuo/nix.git
synced 2026-01-23 23:45:58 +00:00
6182625199
see also: https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/
2 lines
26 B
Plaintext
2 lines
26 B
Plaintext
/CHANGELOG.md merge=union
|