comparison ssdt.ci.ivy.settings.xml @ 144:7fead80bdd6a

handle merge working directories (multiple parent branches)
author Dave Smith <smith@nwoca.org>
date Fri, 25 Oct 2013 21:27:11 +0100
parents 246f0c7ba9b6
children f88fe4898ee5
comparison
equal deleted inserted replaced
143:1963264c39c4 144:7fead80bdd6a