comparison ssdt.ci.ivy.settings.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 246f0c7ba9b6
children f88fe4898ee5
comparison
equal deleted inserted replaced
142:45d2396e9fc8 143:1963264c39c4