rename diffconflicts -> vimmerge
configure hg