diff options
| author | André Spiegel <spiegel@gnu.org> | 1998-03-31 17:19:32 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 1998-03-31 17:19:32 +0000 |
| commit | 18483cf000f867954b23d958f4d3d50abbfd3f9e (patch) | |
| tree | dfe78abbf1fa855d6b22aea3019ff71f8d368098 /lisp/emacs-lisp/debug.el | |
| parent | 652838b531e16056fa17595358289c4505c492be (diff) | |
| download | emacs-18483cf000f867954b23d958f4d3d50abbfd3f9e.tar.gz emacs-18483cf000f867954b23d958f4d3d50abbfd3f9e.tar.bz2 emacs-18483cf000f867954b23d958f4d3d50abbfd3f9e.zip | |
* vc.el (vc-resolve-conflicts): New function.
(vc-next-action-on-file): Use it.
(vc-backend-revert): For CVS, revert to the version the buffer was
based on, not the latest on the current branch (same behavior as
for RCS). For SCCS, forget vc-workfile-version so that it gets
recomputed.
(vc-revert-buffer): Rewrote doc string to explain the above.
(vc-finish-logentry): Don't add extra newline.
Diffstat (limited to 'lisp/emacs-lisp/debug.el')
0 files changed, 0 insertions, 0 deletions