-
Kevin Atkinson authored
The merge build system allows you to have multiple topic branches installed on your devel tree or inner emulab. It is primary designed to allow keeping unfinished topic branches installed while working on something else. See http://users.emulab.net/trac/emulab/wiki/MergeBuild Conflicts: .gitignore Makeconf.in configure
8522b1e7