Mercurial > emacs
comparison man/ediff.texi @ 63676:5a0f08de3a11
(Miscellaneous): Texinfo usage fix.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 23 Jun 2005 01:20:30 +0000 |
| parents | 25867a9e5444 |
| children | 3723093a21fd b7da78284d4c |
comparison
equal
deleted
inserted
replaced
| 63675:b30d9d1d20b5 | 63676:5a0f08de3a11 |
|---|---|
| 2264 unless the file is under version control. For a checked-in file under | 2264 unless the file is under version control. For a checked-in file under |
| 2265 version control, Ediff first tries to check the file out. | 2265 version control, Ediff first tries to check the file out. |
| 2266 | 2266 |
| 2267 @item ediff-make-buffers-readonly-at-startup nil | 2267 @item ediff-make-buffers-readonly-at-startup nil |
| 2268 @vindex ediff-make-buffers-readonly-at-startup | 2268 @vindex ediff-make-buffers-readonly-at-startup |
| 2269 If t, all variant buffers are made read-only at Ediff startup. | 2269 If @code{t}, all variant buffers are made read-only at Ediff startup. |
| 2270 | 2270 |
| 2271 @item ediff-keep-variants | 2271 @item ediff-keep-variants |
| 2272 @vindex @code{ediff-keep-variants} | 2272 @vindex @code{ediff-keep-variants} |
| 2273 The default is @code{t}, meaning that the buffers being compared or merged will | 2273 The default is @code{t}, meaning that the buffers being compared or merged will |
| 2274 be preserved when Ediff quits. Setting this to @code{nil} causes Ediff to | 2274 be preserved when Ediff quits. Setting this to @code{nil} causes Ediff to |