fixed hgrc to use splice for merges