https://www.freshports.org/devel/cvslines/
FreshPorts -- devel/cvslines: Wrapper to ease merging of changes between CVS branches
cvslines extends the capability of the cvs commit command, to provide extra support in managing multiple concurrent lines of development. cvslines is a...