Mercurial > emacs
diff etc/README @ 111267:7f0afd30f764
More merge fixes.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 31 Oct 2010 19:38:16 +0100 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 31 Oct 2010 19:38:16 +0100 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |