Records to ignore .orig/.rej were added in b1f7154cb125.
It turns out that some currently-used developer workflows rely on git reporting .rej files after the merges.
As there is no easy is no easy way to override project .gitignore files locally, remove these records from our .gitignore.