Could you pull a request? I tried `git am` it, but it outputs:

Applying: Move Parrot_cpu_type function out of src/platform/misc.c.
/home/jimmy/parrot/.git/rebase-apply/patch:138: new blank line at EOF.
+
error: patch failed: src/platform/generic/misc.c:12
error: src/platform/generic/misc.c: patch does not apply
error: patch failed: src/platform/netbsd/misc.c:22
error: src/platform/netbsd/misc.c: patch does not apply
/home/jimmy/parrot/.git/rebase-apply/patch:331: new blank line at EOF.
+
error: patch failed: src/platform/win32/misc.c:56
error: src/platform/win32/misc.c: patch does not apply
Patch failed at 0001 Move Parrot_cpu_type function out of
src/platform/misc.c.
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".



---
Jimmy Zhuo


_______________________________________________
http://lists.parrot.org/mailman/listinfo/parrot-dev

Reply via email to