diff options
| author | Stefan Monnier | 2004-03-10 23:42:37 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2004-03-10 23:42:37 +0000 |
| commit | 7d85a64e42336fb6330a1d89aa1e47b0af8e265a (patch) | |
| tree | 29ba4086cf591ed2e8fbc249d55aafe1b48f375a /src | |
| parent | 197d4ebcbcc24adcaa1a5e6995bef8be15ea76ae (diff) | |
| download | emacs-7d85a64e42336fb6330a1d89aa1e47b0af8e265a.tar.gz emacs-7d85a64e42336fb6330a1d89aa1e47b0af8e265a.zip | |
(smerge-check-cache, smerge-check): New var and fun.
(smerge-mode-menu): Use it to deactivate menu entries.
(smerge-keep-current): New fun.
(smerge-keep-current): Use it.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions