OXYGENHUB
◆ identical-sides oxygen / .oxyattributes
87 B · last changed merge=union: a checkout keeps both sides of a union file's adjacent insertions (refs #145) 10 days ago source blame history raw
4afe288b Andy McCall ↶ 1 
# oxygen#145: two changes adding changelog entries keep both.
2 
CHANGELOG.md merge=union