diff options
| author | Sean Whitton | 2025-09-25 17:44:30 +0100 |
|---|---|---|
| committer | Sean Whitton | 2025-09-25 17:44:30 +0100 |
| commit | b2e35d1d2c52d9d00809550702f9f4628651cfe2 (patch) | |
| tree | d29942a2ec2f678aaeb106cdd354318391e9fb57 /java/res | |
| parent | 3536f1aa3371ab254e6cf96c2a21512049998644 (diff) | |
| download | emacs-b2e35d1d2c52d9d00809550702f9f4628651cfe2.tar.gz emacs-b2e35d1d2c52d9d00809550702f9f4628651cfe2.zip | |
vc-git--checkin: Avoid passing --ours to git-apply
* lisp/vc/vc-git.el (vc-git--with-apply-temp): New BUFFER param.
(vc-git--checkin): Avoid passing --ours to git-apply.
Diffstat (limited to 'java/res')
0 files changed, 0 insertions, 0 deletions