diff ssdt.default.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 44c4cb9d0fed
children 2f6d25a71778
line wrap: on
line diff