Jeff Squyres, le Tue 20 Oct 2009 20:33:09 -0400, a écrit : > An example is in topology- > linux.c; svn merge didn't find a corresponding section for the change, > but the section below it seems like it might have been replaced by the > conflicting section...?
This code is a new feature of the trunk (cgroup support) Samuel
