diff options
| author | Sean Whitton | 2025-09-24 16:07:51 +0100 |
|---|---|---|
| committer | Sean Whitton | 2025-09-24 16:07:51 +0100 |
| commit | 8368fcb38c1d6c01c78018058df635666f1e8248 (patch) | |
| tree | bbb468941baf56adf2571fe34e074e40dc232933 /java/res/layout | |
| parent | 190450f4f02422e08877316050da6a2240aa7d0d (diff) | |
| download | emacs-8368fcb38c1d6c01c78018058df635666f1e8248.tar.gz emacs-8368fcb38c1d6c01c78018058df635666f1e8248.zip | |
vc-git--checkin: Apply PATCH-STRING to working tree
* lisp/vc/vc-git.el
(vc-git--with-apply-temp-to-staging): Rename ...
(vc-git--with-apply-temp): ... to this. New ARGS parameter.
All uses changes.
(vc-git--checkin): In POST function, apply PATCH-STRING to the
working tree with 'git apply --3way --ours'.
* lisp/vc/vc-hg.el (vc-hg--checkin): Document what the call to
'hg update' is for.
* test/lisp/vc/vc-tests/vc-tests.el (vc-test--checkin-patch):
Delete completed FIXME and workaround.
Diffstat (limited to 'java/res/layout')
0 files changed, 0 insertions, 0 deletions