Mercurial > public > develkit
diff castor-ant.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 | 139a3611ae99 |
children |
author | Dave Smith <smith@nwoca.org> |
---|---|
date | Fri, 25 Oct 2013 21:29:39 +0100 |
parents | 139a3611ae99 |
children |