Commit 7b27b6cf716429080fbc968d8f573977996ee112

Robert Coup 2019-06-06T16:32:09

Refactor testing: - move duplication between merge/trees/ and merge/workdir/ into merge/analysis{.c,.h} - remove merge-resolve.git resource, open the existing merge-resolve as a bare repo instead.