Add -Wconflicts-sr and -Wconflicts-rr.
[bison.git] / .gitattributes
CommitLineData
fdd2c97c 1ChangeLog merge=merge-changelog