diff options
| author | Sean Whitton | 2025-09-25 18:19:38 +0100 |
|---|---|---|
| committer | Sean Whitton | 2025-09-25 18:19:38 +0100 |
| commit | 9a86a093bc199919e7fff422eb664b78f4ce02d7 (patch) | |
| tree | ec04afff3c830584d9d066e2ff3373df1794179d /java/res/layout | |
| parent | 69ac58b5d2a87be4d88543399f97486a31a95498 (diff) | |
| download | emacs-9a86a093bc199919e7fff422eb664b78f4ce02d7.tar.gz emacs-9a86a093bc199919e7fff422eb664b78f4ce02d7.zip | |
vc-git--checkin: Ignore 'git apply --3way' exiting 1
This is expected to happen in some cases.
* lisp/vc/vc-git.el (vc-git--with-apply-temp): New OKSTATUS
parameter.
(vc-git--checkin): Use it to ignore 'git apply --3way' exiting
1.
Diffstat (limited to 'java/res/layout')
0 files changed, 0 insertions, 0 deletions