diff options
author | Andreas Schwab <schwab@suse.de> | 2003-03-27 22:40:29 +0000 |
---|---|---|
committer | Andreas Schwab <schwab@suse.de> | 2003-03-27 22:40:29 +0000 |
commit | 92788b3bcd2cb4bd8e67a789dfcee2c9a0a1a3c1 (patch) | |
tree | 029cce0abde82b22ff2a2531afaa36d85983e519 /lisp/emacs-lisp/trace.el | |
parent | 84f2e615526fec2051c9980aff9c52d406847ca5 (diff) | |
download | emacs-92788b3bcd2cb4bd8e67a789dfcee2c9a0a1a3c1.tar.gz emacs-92788b3bcd2cb4bd8e67a789dfcee2c9a0a1a3c1.tar.bz2 emacs-92788b3bcd2cb4bd8e67a789dfcee2c9a0a1a3c1.zip |
(vc-cvs-parse-entry): Make sure a file with conflicts
is marked as edited.
Diffstat (limited to 'lisp/emacs-lisp/trace.el')
0 files changed, 0 insertions, 0 deletions