added .orig extension for unresolved merges
This commit is contained in:
parent
4566762024
commit
8400819cb0
Loading…
Reference in New Issue