diff lisp/startup.el @ 93368:411d7b7dfe32

(vc-bzr-state-heuristic): Fix last change for when there are conflicts.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 29 Mar 2008 01:09:45 +0000
parents dc744cb72de0
children d10cd2d8d9ae
line wrap: on
line diff