Mercurial > emacs
diff lisp/allout.el @ 93976:c53b75d15c27
(vc-bzr-after-dir-status): Detect the conflict state.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Thu, 10 Apr 2008 15:03:27 +0000 |
parents | a1a12ed4e5e2 |
children | ee5932bf781d |
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Thu, 10 Apr 2008 15:03:27 +0000 |
parents | a1a12ed4e5e2 |
children | ee5932bf781d |