[defconfig] get rid of -i option

Now, update command always uses merge tool.