OXYGENHUB
◆ v0.9.19 oxygenhub / .oxyattributes
134 B · last changed CHANGELOG.md merge=union: entries added side by side keep both (oxygen#145) 9 days ago source blame history raw
547f728a Andy McCall 1 
# oxygen#145: two changes that each add a changelog entry in the same
2 
# place keep both, without a conflict.
3 
CHANGELOG.md merge=union