Signed-off-by: Michael Crosby <crosbymichael@gmail.com> Conflicts: pkg/archive/diff.go pkg/chrootarchive/archive.go Conflicts: pkg/archive/diff.go pkg/chrootarchive/diff.go Upstream-commit: 7862f831fe99a221a0499b7764a8709e5f463bb9 Component: engine
Signed-off-by: Michael Crosby <crosbymichael@gmail.com> Conflicts: pkg/archive/diff.go pkg/chrootarchive/archive.go Conflicts: pkg/archive/diff.go pkg/chrootarchive/diff.go Upstream-commit: 7862f831fe99a221a0499b7764a8709e5f463bb9 Component: engine