Mercurial > emacs
comparison admin/ChangeLog @ 59549:eda381049620
Fix commit conflicts.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 15 Jan 2005 11:48:58 +0000 |
| parents | 41263d3a8d8b |
| children | f7441c36b762 e24e2e78deda |
comparison
equal
deleted
inserted
replaced
| 59548:83df5808ec6b | 59549:eda381049620 |
|---|