Committed revision 534 to http://stephe-leake.org/dvc
improve xmtn-conflicts; restructure, add orphaned_node.
* lisp/xmtn-basic-io.el (xmtn-basic-io-optional-line): change to reparse
current line if it doesn't match.
* lisp/xmtn-conflicts.el (xmtn-conflicts-conflict): use a single struct,
not a hierarchy. Simpler code this way. Add orphaned_node. restructure
resolution menu around resolutions, not conflict types; simpler. not fully
tested.
* lisp/xmtn-ids.el (xmtn--branches-of): match change in
xmtn-basic-io-optional-line.
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
