Mercurial > emacs
diff man/vip.texi @ 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 | 3649390c0f91 |
children | 3723093a21fd |