comparison bootstrap.xml @ 143:1963264c39c4

handle merge working directories (multiple parent branches)
author Dave Smith <smith@nwoca.org>
date Fri, 25 Oct 2013 21:21:28 +0100
parents f8b0dde24622
children 7a36ea2cb81a
comparison
equal deleted inserted replaced
142:45d2396e9fc8 143:1963264c39c4