Tree
- Tree:
463d871bda8e2a668463810ccb34cf7963c8992f
- Date:
- Message:
- got patch: use diff3 to merge the changes Parse the "blob -" metadata in diffs produced by 'got diff' and use the original file for patching. Then, use the diff3 with the current version of the file to merge the differences. This solves many failures automagically or at least turns them into a conflict. ok/improvements stsp@
Makefile | commits | blame |
delta_test.c | commits | blame |