Mercurial > emacs
comparison oldXMenu/InsPane.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 |
| parents | 695cf19ef79e |
| children | f0eb34e60705 e8824c4f5f7e 375f2633d815 |
comparison
equal
deleted
inserted
replaced
| 54585:1335f36a4a64 | 54586:c3043c1faed3 |
|---|