Committed revision 500 to http://stephe-leake.org/dvc
improve support for xmtn conflict resolution. make dvc-delta interactive.
* lisp/dvc-diff.el (dvc-file-ediff): disable local variables.
* lisp/dvc-log.el (dvc-ediff-setup): new.
* lisp/dvc-unified.el (dvc-delta): make interactive, allow back-end
specific revision specifier strings.
(dvc-log-edit): support conflicts buffers.
* lisp/xmtn-conflicts.el: improve support for conflicts resolution.
* lisp/xmtn-dvc.el (xmtn-dvc-log-message): new
(xmtn-dvc-log-clean): new
(xmtn-dvc-log-edit-done): use them
(xmtn-dvc-delta): support selectors
(xmtn-propagate-from): support log message.
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
