Is it possible to save conflict contents to a new .rej file?

neilbrown / wiggle

apply rejected patches and perform word-wise diffs

http://neil.brown.name/wiggle

GNU General Public License v2.0

91 stars 8 forks source link

Is it possible to save conflict contents to a new .rej file? #18

Open hao-lee opened 3 years ago

hao-lee commented 3 years ago

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.

neilbrown commented 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.