[Wikitech-l] External editor with merge capability?