comparison lisp/hexl.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 8fcc1d6b9fde
children 154aba86b686
comparison
equal deleted inserted replaced
93975:1e3a407766b9 93976:c53b75d15c27