2 commits

Author	SHA1	Message	Date
Joey Hess	62372ee052	resolvemerge: Improve cleanup of cruft left in the working tree by a conflicted merge ... This commit was sponsored by Jake Vosloo on Patreon.	2020-09-07 16:50:27 -04:00
Joey Hess	03dee56546	revert change that broke test suite ... Opened a new bug about it. This commit was sponsored by Ethan Aubin.	2020-09-07 15:42:38 -04:00