diff options
| author | André Spiegel <spiegel@gnu.org> | 1998-04-05 18:45:06 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 1998-04-05 18:45:06 +0000 |
| commit | ccb141e8e1d5584d29ff0e41c637cfc0a64177e6 (patch) | |
| tree | ee21dc003276555b4e30334c98cb6eb4f965df8a /lisp/emacs-lisp | |
| parent | e27827ddcc91e77f68c3af495354cb61229b7319 (diff) | |
| download | emacs-ccb141e8e1d5584d29ff0e41c637cfc0a64177e6.tar.gz emacs-ccb141e8e1d5584d29ff0e41c637cfc0a64177e6.tar.bz2 emacs-ccb141e8e1d5584d29ff0e41c637cfc0a64177e6.zip | |
(vc-merge, vc-backend-merge): New functions.
(vc-resolve-conflicts): Added optional parameters for buffer names.
(vc-branch-p): New function.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions