Mercurial > emacs
diff lisp/ibuf-ext.el @ 108947:ca556d6b7c7a
Conflict resolution fixup
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | 0b37f86b040e |
children | a3e1f7134e6e |
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | 0b37f86b040e |
children | a3e1f7134e6e |