On 13/12/2018 22.58, Stefan Monnier wrote: > Here's another, `git am` doesn't like this one :'(
Applying: Fix remaining uses of CL; Make files more declarative error: acl2/acl2.el: does not match index error: coq/coq-autotest.el: does not match index error: coq/coq-db.el: does not match index error: coq/coq-par-compile.el: does not match index error: coq/coq-par-test.el: does not match index error: coq/coq-seq-compile.el: does not match index error: coq/coq-syntax.el: does not match index error: etc/testsuite/pg-test.el: does not match index error: generic/pg-autotest.el: does not match index error: generic/pg-movie.el: does not match index error: generic/pg-user.el: does not match index error: generic/proof-script.el: does not match index error: generic/proof-splash.el: does not match index error: generic/proof-syntax.el: does not match index error: generic/proof-useropts.el: does not match index error: generic/proof-utils.el: does not match index error: generic/proof.el: does not match index error: obsolete/plastic/plastic.el: does not match index Patch failed at 0001 Fix remaining uses of CL; Make files more declarative The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Clément.
signature.asc
Description: OpenPGP digital signature
_______________________________________________ ProofGeneral-devel mailing list ProofGeneral-devel@inf.ed.ac.uk http://lists.inf.ed.ac.uk/mailman/listinfo/proofgeneral-devel
