wiggle

wiggle copied to clipboard

Wiggle is absolutely amazing, thank you

4

Thank you for developing such a great tool! It saved many hours of useless work for me, and will eventually save months and years!

dmikushin

wiggle: cannot load file 'null' - No such file or director

2

When I'm trying to wiggle a git patch removing a file, I get the following error: ``` % wiggle -r -p1 0001-Removing-Boost-based-SSL-backend-replacing-it-with-C.patch wiggle: bad unified patch at line 33 wiggle:...

dmikushin

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

1

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

hao-lee

ignore new white space in the patch context

2

# unexpected new line in context if a new line has appeared in the patch context since the patch was created the patch is not cleanly applied there could be...

john-peterson