Mercurial > emacs
diff lib-src/ntlib.c @ 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 (2004-03-26) |
parents | 695cf19ef79e |
children | 23a17af379b1 375f2633d815 |