summaryrefslogtreecommitdiffstats
path: root/src/bin/lfc/.gitattributes
blob: cdc3b102d4b38841698804acbfcf871699adf82e (plain)
1
2
/lfc_messages.cc                 -diff merge=ours
/lfc_messages.h                  -diff merge=ours