diff options
| author | Dan Nicolaescu | 2008-04-10 15:03:27 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-04-10 15:03:27 +0000 |
| commit | 21f7bc38bd59c9fd001da737808701ce3597e339 (patch) | |
| tree | 9421a89ca93dd2341596b42755d1a8b2fe7473c0 /src/ChangeLog | |
| parent | cbee283dd7dd655124e81a6bd555506476180b5d (diff) | |
| download | emacs-21f7bc38bd59c9fd001da737808701ce3597e339.tar.gz emacs-21f7bc38bd59c9fd001da737808701ce3597e339.zip | |
(vc-bzr-after-dir-status): Detect the conflict state.
Diffstat (limited to 'src/ChangeLog')
0 files changed, 0 insertions, 0 deletions