Committed revision 476 to http://bzr.xsteve.at/dvc/

Patch from Michael Olson: xgit: Support the "unmerged" state.
  
  * lisp/xgit.el (xgit-parse-status-sort): Add 'conflict, which sorts
    before the rest.
    (xgit-parse-status): If a file is "unmerged", treat it as 'conflict.

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

Reply via email to