diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-03-26 16:17:33 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-03-26 16:17:33 +0000 |
| commit | 8dc87047d15a17c418495169707ca71439cea684 (patch) | |
| tree | b8b1b6858190883c5f4657dbf6a7a0008e85f802 /lisp/emacs-lisp/float-sup.el | |
| parent | e1fbd956b0d9e4c91ef72fb7d9f18018c2719677 (diff) | |
| download | emacs-8dc87047d15a17c418495169707ca71439cea684.tar.gz emacs-8dc87047d15a17c418495169707ca71439cea684.tar.bz2 emacs-8dc87047d15a17c418495169707ca71439cea684.zip | |
(vc-maybe-resolve-conflicts): Don't prompt the user.
Diffstat (limited to 'lisp/emacs-lisp/float-sup.el')
0 files changed, 0 insertions, 0 deletions