hgbook

diff it/figs/bad-merge-2.dot @ 1030:2ac31ea48a3d

merge with trunk
author Romain PELISSE <belaran@gmail.com>
date Thu Apr 22 12:39:32 2010 +0200 (2010-04-22)
parents 713f0f69029a 793e15b562ef
children
line diff