Commit Graph

3 Commits

Author SHA1 Message Date
Nick Lewycky
d6e3138a3d Use union merge on the changelog file.
This keeps both sides of a conflict. It's essentially the same as removing the
conflict markers.
2019-09-13 14:46:37 -07:00
Syrus Akbary
73125edd61
Fixed spectests ignored by git attributes 2019-01-31 13:43:04 -08:00
Syrus
4185a10e48 Improved linguist to skip WebAssembly/C files 2019-01-24 15:50:06 -08:00