comparison ssdt.ci.ivy.settings.xml @ 145:cea4e793a3f4

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