diff options
| author | Stefan Monnier | 2007-08-16 20:04:36 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-08-16 20:04:36 +0000 |
| commit | de6895115622ceeda27e82ccc254a1e3f57c23d6 (patch) | |
| tree | b9ccfe4aef23d6b032fb9c4dfc52ccceb1388885 /src/bytecode.c | |
| parent | ed0e2ad11b2b80f7a8505b72285c7ff041a5b37b (diff) | |
| download | emacs-de6895115622ceeda27e82ccc254a1e3f57c23d6.tar.gz emacs-de6895115622ceeda27e82ccc254a1e3f57c23d6.zip | |
(smerge-resolve): New arg `safe'.
(smerge-resolve-all, smerge-batch-resolve): New function.
(smerge-refine): Make sure `diff' returns the expected result.
(smerge-parsep-re): New const.
(smerge-mode): Use it to adjust paragraph-separate.
Diffstat (limited to 'src/bytecode.c')
0 files changed, 0 insertions, 0 deletions