[CRIU] [GIT PULL] tools, cpt2: Initial merge

Pavel Emelyanov xemul at parallels.com
Mon May 27 06:28:17 EDT 2013


>  create mode 100644 tools/cpt2/src/fdset.c
>  create mode 100644 tools/cpt2/src/image-defs.c
>  create mode 100644 tools/cpt2/src/image.c

How can I merge this tree after you've explicitly copied at
least the image and the fdset routines from crtools while I
asked not to do it?!

Thanks,
Pavel


More information about the CRIU mailing list