Commit 7534fa5e authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

(vc-bzr-after-dir-status): Ignore pending merges.

parent 8a908224
2010-01-06 Dan Nicolaescu <dann@ics.uci.edu>
* vc-bzr.el (vc-bzr-after-dir-status): Ignore pending merges.
2010-01-05 Tom Tromey <tromey@redhat.com>
* progmodes/python.el (python-font-lock-keywords): Handle
......
......@@ -671,7 +671,6 @@ stream. Standard error output is discarded."
;; For conflicts, should we list the .THIS/.BASE/.OTHER?
("C " . conflict)
("? " . unregistered)
("? " . unregistered)
;; No such state, but we need to distinguish this case.
("R " . renamed)
;; For a non existent file FOO, the output is:
......@@ -683,6 +682,8 @@ stream. Standard error output is discarded."
;; FIXME: maybe this warning can be put in the vc-dir header...
("wor" . not-found)
;; Ignore "P " and "P." for pending patches.
("P " . not-found)
("P. " . not-found)
))
(translated nil)
(result nil))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment