Mercurial > emacs
comparison lisp/vc-bzr.el @ 94521:2a61c5f918a5
Change 'needs-patch to 'needs-update.
| author | Eric S. Raymond <esr@snark.thyrsus.com> |
|---|---|
| date | Thu, 01 May 2008 19:13:16 +0000 |
| parents | ad6c174910db |
| children | a69dcc2c42ae |
comparison
equal
deleted
inserted
replaced
| 94520:069edac43148 | 94521:2a61c5f918a5 |
|---|---|
| 273 '((added . added) | 273 '((added . added) |
| 274 (kindchanged . edited) | 274 (kindchanged . edited) |
| 275 (renamed . edited) | 275 (renamed . edited) |
| 276 (modified . edited) | 276 (modified . edited) |
| 277 (removed . removed) | 277 (removed . removed) |
| 278 (ignored . unregistered) | 278 (ignored . ignored) |
| 279 (unknown . unregistered) | 279 (unknown . unregistered) |
| 280 (unchanged . up-to-date))))))) | 280 (unchanged . up-to-date))))))) |
| 281 | 281 |
| 282 (defun vc-bzr-resolve-when-done () | 282 (defun vc-bzr-resolve-when-done () |
| 283 "Call \"bzr resolve\" if the conflict markers have been removed." | 283 "Call \"bzr resolve\" if the conflict markers have been removed." |