Committed revision 523 to http://stephe-leake.org/dvc

fix bugs in xmtn-conflicts.
  
  * lisp/dvc-unified.el (dvc-log-edit): support 'conflicts mode.
  
  * lisp/xmtn-conflicts.el (xmtn-conflicts-resolve-map): fix syntax
    (xmtn-conflicts-add-log-entry): fix name
    (xmtn-conflicts-do-propagate, -do-merge): save log buffer
    (xmtn-conflicts-mode-map): fix menu entry.
  
  * lisp/xmtn-dvc.el (xmtn-dvc-log-message): finish. support no log file.

-- 
-- Stephe

_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev

Reply via email to