Mercurial > emacs
view admin/notes/trailing-whitespace @ 87767:90318261ac4d
(smerge-refine): Also work on "same change conflicts".
(smerge-makeup-conflict): New command.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 15 Jan 2008 21:40:09 +0000 |
parents | 695cf19ef79e |
children | 375f2633d815 ef719132ddfa |
line wrap: on
line source
ttn 2003-02-14 apparently there was a big discussion on emacs-devel wrt trailing whitespace. there was a mass-change to remove such from various branches in cvs. probably it's a good idea to avoid adding trailing whitespace in new code/docs and in changes. ;;; arch-tag: de441379-c345-4826-a784-352b5413a698