Richard Marko <[email protected]> writes: > Signed-off-by: Richard Marko <[email protected]> > --- > src/include/internal_libreport.h | 1 + > src/lib/problem_data.c | 1 + > 2 files changed, 2 insertions(+), 0 deletions(-)
not applicable $ git am -3s cgroups Applying: Add cgroup information filename fatal: corrupt patch at line 26 Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Add cgroup information filename When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". please fix your patch -- Nikola
