Mercurial > emacs
comparison lispintro/makefile.w32-in @ 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 | b0293635c42b |
| children | 9077e3f7cd49 |
comparison
equal
deleted
inserted
replaced
| 54585:1335f36a4a64 | 54586:c3043c1faed3 |
|---|