Tree
- Tree:
5c55e9be44be2a33ba7cca3dccbe0236d1436a06
- Date:
- Message:
- fix `got patch -R' when using diff3 merge `got patch -R' fails spectacularly when applied on a diff that contains the info of the original blob for the diff3 merge machinery since it tries to apply the reverse of the patch to the old blob. change it to run the patch (_not_ reversed) on the old blob and then swap the arguments to got_diff3_merge which gives us the correct reverse merge of the diff. while here add a test case too. reported by naddy, discussed with and ok stsp@
Makefile | commits | blame |
gotadmin.1 | commits | blame |
gotadmin.c | commits | blame |