]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 652838b) | patch
* vc.el (vc-resolve-conflicts): New function.
authorAndré Spiegel <spiegel@gnu.org>
Tue, 31 Mar 1998 17:19:32 +0000 (17:19 +0000)
committerAndré Spiegel <spiegel@gnu.org>
Tue, 31 Mar 1998 17:19:32 +0000 (17:19 +0000)
commit18483cf000f867954b23d958f4d3d50abbfd3f9e
treedfe78abbf1fa855d6b22aea3019ff71f8d368098tree | snapshot
parent652838b531e16056fa17595358289c4505c492becommit | diff
* 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.
lisp/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.