diff options
| author | Mauro Aranda | 2025-04-01 14:16:02 -0300 |
|---|---|---|
| committer | Mauro Aranda | 2025-04-01 14:16:02 -0300 |
| commit | 883355cef7c758067b49f50ab98cc5516da55155 (patch) | |
| tree | e6725a7736e76d2f2bc02d7355e05ce656e5d305 /exec | |
| parent | 975d58c4c8d22555a702c418bb68225e6fc630d0 (diff) | |
| download | emacs-883355cef7c758067b49f50ab98cc5516da55155.tar.gz emacs-883355cef7c758067b49f50ab98cc5516da55155.zip | |
Move a vc option to a preloaded file
Since vc-resolve-conflicts is referenced in backend files, which only
require vc at runtime, move it to vc-hooks to avoid a void
variable error. (Bug#3860)
* lisp/vc/vc.el (vc-resolve-conflicts): Move from here...
* lisp/vc/vc-hooks.el (vc-resolve-conflicts): ...to here.
Diffstat (limited to 'exec')
0 files changed, 0 insertions, 0 deletions