mirror of
https://github.com/nim-lang/Nim.git
synced 2025-12-28 17:04:41 +00:00
7 lines
329 B
Plaintext
7 lines
329 B
Plaintext
# Avoids changelog conflicts by assuming additions-only, which is by far the common case.
|
|
# In the rare case where branch b1 rebases against branch b2 and both branches
|
|
# modified the same changelog entry, you'll end up with that changelog entry
|
|
# duplicated, which is easily identifiable and fixable.
|
|
/changelog.md merge=union
|
|
|