2008-07-01 13:04 AEST by Arthur Barrett - Support bi-directional merges (inverse merge) in 2.5.04 (see 'cvs update -i' and update.cpp).