freebsd-update editor choice

[Gene]

Hi -

I'm using freebsd-update to update my 10.1 system to 10.2. When merging files,
it insists on using the 'vi' editor. I really, really, REALLY, despise vi. Is
there a way to get it to use another editor?

Thanks,

--