Mercurial > emacs
diff lisp/whitespace.el @ 108947:ca556d6b7c7a
Conflict resolution fixup
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | 904ccd8f2acb |
children | 3ea5c230ba38 |
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | 904ccd8f2acb |
children | 3ea5c230ba38 |