Committed revision 498 to http://stephe-leake.org/dvc
improve xmtn-conflicts; dvc-merge use them.
* lisp/xmtn-automate.el (xmtn--tree-default-branch): move here from
xmtn-dvc, to share with xmtn-conflicts
* lisp/xmtn-conflicts.el (xmtn-conflicts-left-work): new variable
(xmtn-conflicts-parse-header): store branch in dvc-conflicts-opts file
(xmtn-conflicts-save-opts, xmtn-conflicts-load-opts): new
(xmtn-conflicts-merge): always use merge heads.
* lisp/xmtn-dvc.el (xmtn-dvc-merge): use conflicts file if present.
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
