diff options
| -rw-r--r-- | lisp/vc.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index b4dd9eaf6ef..64b1e943f82 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -1286,18 +1286,18 @@ After check-out, runs the normal hook `vc-checkout-hook'." | |||
| 1286 | (run-hooks 'vc-checkout-hook)) | 1286 | (run-hooks 'vc-checkout-hook)) |
| 1287 | 1287 | ||
| 1288 | (defun vc-mark-resolved (backend files) | 1288 | (defun vc-mark-resolved (backend files) |
| 1289 | (with-vc-properties | 1289 | (prog1 (with-vc-properties |
| 1290 | files | 1290 | files |
| 1291 | (vc-call-backend backend 'mark-resolved files) | 1291 | (vc-call-backend backend 'mark-resolved files) |
| 1292 | (message | 1292 | ;; FIXME: Is this TRTD? Might not be. |
| 1293 | (substitute-command-keys | 1293 | `((vc-state . edited))) |
| 1294 | "Conflicts have been resolved in %s. \ | 1294 | (message |
| 1295 | (substitute-command-keys | ||
| 1296 | "Conflicts have been resolved in %s. \ | ||
| 1295 | Type \\[vc-next-action] to check in changes.") | 1297 | Type \\[vc-next-action] to check in changes.") |
| 1296 | (if (> (length files) 1) | 1298 | (if (> (length files) 1) |
| 1297 | (format "%d files" (length files)) | 1299 | (format "%d files" (length files)) |
| 1298 | "this file")) | 1300 | "this file")))) |
| 1299 | ;; FIXME: Is this TRTD? Might not be. | ||
| 1300 | `((vc-state . edited)))) | ||
| 1301 | 1301 | ||
| 1302 | (defun vc-steal-lock (file rev owner) | 1302 | (defun vc-steal-lock (file rev owner) |
| 1303 | "Steal the lock on FILE." | 1303 | "Steal the lock on FILE." |