Add merge conflict and patch reject file ignore filters.