Like the console procs I have moved the code related to merge
support into their own namespace, so that they are isolated
from the rest of the world.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>