Open hao-lee opened 3 years ago
I might make sense to add such an option, and it should be fairly easy to do. However I have no interest in working on it at the moment. If you would like to try writing some code, I would be happy to review any patch you produce, or to provide suggestions if you cannot see how to get started.
I think it would be better to provide a option that saves conflict contents to a new
.rej
file. Then I can resolve them manually as there won't be too many conflicts after wiggling.