Mercurial > emacs
diff ChangeLog @ 54586:c3043c1faed3
(vc-maybe-resolve-conflicts): Don't prompt the user.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 26 Mar 2004 16:17:12 +0000 |
parents | fbc008c6f0cc |
children | 5fb1ee559bf7 108bb5537c12 |