Somtimes broken merges leave over -MERGING-* directories in the db. Could emaint be enhanced to clean those directories?
*** This bug has been marked as a duplicate of bug 192778 ***