(vc-bzr-state-heuristic): Fix last change for when there are conflicts.
authorStefan Monnier <monnier@iro.umontreal.ca>
Sat, 29 Mar 2008 01:09:45 +0000 (01:09 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Sat, 29 Mar 2008 01:09:45 +0000 (01:09 +0000)
commit769087cead629d7ad1fd5cfc15ce75625a78e6b3
tree67d0ca721590ed57b25d078bb38bcaf037367a98
parentc6ea7ec62cc3d693865fd3756c7b13caf326d25b
(vc-bzr-state-heuristic): Fix last change for when there are conflicts.
lisp/ChangeLog
lisp/vc-bzr.el