Commit 0a22ca1a5a1261bb7e230db211a205b68e1c3044
2020-09-23T22:31:00
make 'got histedit' collapse folded add+delete operations into a no-op If a merged commit wants to delete a locally added file, and this locally added file matches the content which was deleted in the commit being merged, we can go ahead with the deletion because there is no risk of data loss. fixes the histedit problem reported by jrick on freenode