warning: hg merging

Hi,

Somehow an extra repository head was created again.  I think I have fixed it.  

To avoid this, as noted in http://www.w3.org/2011/prov/wiki/Mercurial_repository, it's good to do a hg pull/hg update before doing any commits, as then you have a chance to resolve any conflicts locally and avoid creating new heads.  

Fingers crossed that I haven't messed it up for others.

--James
-- 
The University of Edinburgh is a charitable body, registered in
Scotland, with registration number SC005336.

Received on Monday, 16 April 2012 00:07:36 UTC