Mercurial > public > develkit
diff osgi-ant-bundlor.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 | 5f8d6291cc66 |
children |
author | Dave Smith <smith@nwoca.org> |
---|---|
date | Fri, 25 Oct 2013 21:27:11 +0100 |
parents | 5f8d6291cc66 |
children |