diff src/ChangeLog.6 @ 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 fc2bcd2a8aad
children 606f2d163a64 0cd73f056781
line wrap: on
line diff