Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | *** empty log message *** | Stefan Monnier | 2000-12-23 | 1 | -39/+1 |
* | (smerge-basic-map): Use `=' rather than `d'. | Stefan Monnier | 2000-12-22 | 1 | -2/+8 |
* | (smerge-basic-map): Use `=' rather than `d'. | Stefan Monnier | 2000-12-22 | 1 | -7/+13 |
* | (smerge-diff): Setup the buffer's default-directory | Stefan Monnier | 2000-10-06 | 1 | -3/+12 |
* | (smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face): | Miles Bader | 2000-10-05 | 1 | -6/+21 |
* | (smerge-mode-menu): Doc fix. | Stefan Monnier | 2000-08-16 | 1 | -4/+6 |
* | (smerge-mode-menu): Fill it out. | Dave Love | 2000-07-21 | 1 | -2/+22 |
* | (smerge-diff-switches): Don't use list* in defcustom. | Dave Love | 2000-05-25 | 1 | -3/+11 |
* | (smerge-auto-leave): New function and variable. | Stefan Monnier | 2000-03-22 | 1 | -41/+40 |
* | New file. Provides a simple minor-mode for files containing | Stefan Monnier | 1999-12-09 | 1 | -0/+453 |