Mercurial > emacs
diff config.guess @ 21368:37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
(vc-resolve-conflicts): Added optional parameters for buffer names.
(vc-branch-p): New function.
author | André Spiegel <spiegel@gnu.org> |
---|---|
date | Sun, 05 Apr 1998 18:45:06 +0000 |
parents | b2ca9c4f82a5 |
children | 9bc88c123895 |