Committed revision 480 to http://stephe-leake.org/dvc
Add first draft of xmtn-conflicts.el; not functional.
* lisp/xmtn-basic-io.el (xmtn-basic-io--read-field): Add doc string.
Allow a symbol value.
(xmtn-basic-io--peek): New.
* lisp/xmtn-conflicts.el: New; parse, edit output of 'automate
conflicts', for 'merge --resolve-conflicts-file'.
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
