summaryrefslogtreecommitdiffstats
path: root/src/lib/process/.gitattributes
blob: 410fcc7e92cf1c06c5c6623b4c7fa7039b4a59c9 (plain)
1
2
/process_messages.cc             -diff merge=ours
/process_messages.h              -diff merge=ours