HCoop / bpt / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ed0e2ad) | patch
(smerge-resolve): New arg `safe'.
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 16 Aug 2007 20:04:36 +0000 (20:04 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 16 Aug 2007 20:04:36 +0000 (20:04 +0000)
commitde6895115622ceeda27e82ccc254a1e3f57c23d6
treeb9ccfe4aef23d6b032fb9c4dfc52ccceb1388885tree | snapshot (tar.gz zip)
parented0e2ad11b2b80f7a8505b72285c7ff041a5b37bcommit | diff
(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.
lisp/ChangeLog diff | blob | blame | history
lisp/smerge-mode.el diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.