Op 2010-06-13 14:35, Jonas Maebe het geskryf: > > svn merge <path to trunk> (either an url or a local checkout) <resolve > conflicts> svn resolved <files that had conflicts> svn ci
Thanks, I made a note of that. > The harder part was resolving the conflicts. The merged version has been > committed in r15421, I hope that I didn't break anything I'll give it a try later today. Thanks. Regards, - Graeme - -- fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal http://opensoft.homeip.net/fpgui/ _______________________________________________ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/mailman/listinfo/fpc-devel
