summaryrefslogtreecommitdiffstats
path: root/src/lib/config/.gitattributes
blob: 789d4e92ffe793df29962d0e76ff48656ded70b6 (plain)
1
2
/config_messages.cc              -diff merge=ours
/config_messages.h               -diff merge=ours