Configure merge=union
for changelog.txt
to reduce merge conflicts
#5185
Loading
merge=union
for changelog.txt
to reduce merge conflicts
#5185