HCoop / bpt / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e89b536) | patch
(smerge-apply-resolution-patch): Fix typo.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 11 Apr 2008 01:10:43 +0000 (01:10 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 11 Apr 2008 01:10:43 +0000 (01:10 +0000)
commit0e05d8fc47f4744f85c46aef451d3b2fa7e315a0
tree5d7b0864834050ba1085ee3ef52074a74002afbatree | snapshot (tar.gz zip)
parente89b536d4b54f200b2f9a6f4561d4b634ef4bbe0commit | diff
(smerge-apply-resolution-patch): Fix typo.
(smerge-resolve): Merge the "2-way refinement" case with one half of
the "mere whitespace" resolution.
lisp/ChangeLog diff | blob | blame | history
lisp/smerge-mode.el diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.