Mercurial > emacs
log lisp/smerge-mode.el @ 95113:032aad659f02
| age | author | description |
|---|---|---|
| Mon, 12 May 2008 18:21:24 +0000 | Stefan Monnier | (smerge-apply-resolution-patch): Don't pass nil to `insert'. |
| Sun, 11 May 2008 20:26:00 +0000 | Reiner Steib | (smerge-start-session): Revert unintended change in revision 1.69. |
| Sun, 11 May 2008 19:00:41 +0000 | Glenn Morris | Re-fill copyright years. |
| Sat, 10 May 2008 13:09:04 +0000 | Reiner Steib | (smerge-command-prefix): Fix custom type. |
| Tue, 06 May 2008 07:58:00 +0000 | Glenn Morris | Switch to recommended form of GPLv3 permissions notice. |
| Mon, 05 May 2008 06:16:20 +0000 | Stefan Monnier | (smerge-start-session): Don't call smerge-next if |
| Fri, 11 Apr 2008 01:10:43 +0000 | Stefan Monnier | (smerge-apply-resolution-patch): Fix typo. |