Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 18:37:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix last fix.

Browse source
This commit is contained in:
Chong Yidong 2008-09-25 01:46:06 +00:00
parent f41d99b0b4
commit 6002d9b956
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/vc.el
View file

@ -1286,18 +1286,18 @@ After check-out, runs the normal hook `vc-checkout-hook'."
(run-hooks 'vc-checkout-hook))
(defun vc-mark-resolved (backend files)
(with-vc-properties
files
(vc-call-backend backend 'mark-resolved files)
(message
(substitute-command-keys
"Conflicts have been resolved in %s. \
(prog1 (with-vc-properties
files
(vc-call-backend backend 'mark-resolved files)
;; FIXME: Is this TRTD? Might not be.
`((vc-state . edited)))
(message
(substitute-command-keys
"Conflicts have been resolved in %s. \
Type \\[vc-next-action] to check in changes.")
(if (> (length files) 1)
(format "%d files" (length files))
"this file"))
;; FIXME: Is this TRTD? Might not be.
`((vc-state . edited))))
(if (> (length files) 1)
(format "%d files" (length files))
"this file"))))
(defun vc-steal-lock (file rev owner)
"Steal the lock on FILE."