(vc-merge, vc-backend-merge): New functions.
authorAndré Spiegel <spiegel@gnu.org>
Sun, 5 Apr 1998 18:45:06 +0000 (18:45 +0000)
committerAndré Spiegel <spiegel@gnu.org>
Sun, 5 Apr 1998 18:45:06 +0000 (18:45 +0000)
commitccb141e8e1d5584d29ff0e41c637cfc0a64177e6
treeee21dc003276555b4e30334c98cb6eb4f965df8a
parente27827ddcc91e77f68c3af495354cb61229b7319
(vc-merge, vc-backend-merge): New functions.
(vc-resolve-conflicts): Added optional parameters for buffer names.
(vc-branch-p): New function.
lisp/vc.el