Committed revision 494 to http://stephe-leake.org/dvc
More xmtn conflicts improvements.
* lisp/dvc-buffers.el (dvc-revert-some-buffers): preserve mode on
revert-buffer; needed for log-edit, conflicts
* lisp/xmtn-conflicts.el (xmtn-conflicts-read): Don't abort on no conflicts.
(xmtn-conflicts-resolve-content-file): new
(xmtn-conflicts-resolve-duplicate_name-ediff): restore window configuration
(xmtn-conflicts-resolve-map): add clear, content file choices
(xmtn-conflicts-dtrt): add fixme; currently broken
(xmtn-conflicts-1): use 'conflicts store'
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
