Skip to content

GitLab

* lisp/vc/ediff-ptch.el (ediff-fixup-patch-map): Remove Git prefixes. 

Strip possible source/destination prefixes such as a/ and b/
from directory names.   (Bug#35420)
(ediff-fixup-patch-map, ediff-dispatch-file-patching-job)
(ediff-patch-file-internal): Replace string-match with string-match-p.
1 job for master in 8 minutes and 38 seconds (queued for 5 seconds)
4bfde2a7
No related merge requests found.
Status Job ID Name Coverage
  Test
failed #1674
test-all

00:08:38

 
Name Stage Failure
failed
test-all Test 
Makefile:807: recipe for target 'bootstrap-emacs.pdmp' failed
make[2]: *** [bootstrap-emacs.pdmp] Error 255
make[2]: Leaving directory '/builds/emacs/emacs/src'
Makefile:424: recipe for target 'src' failed
make[1]: *** [src] Error 2
make[1]: Leaving directory '/builds/emacs/emacs'
make: *** [bootstrap] Error 2
Makefile:1115: recipe for target 'bootstrap' failed
ERROR: Job failed: exit code 1