add meld merge tool to hgrc config, remove generated hgrc