[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Strange ChangeLog entry after merge from emacs-24
From: |
Eli Zaretskii |
Subject: |
Strange ChangeLog entry after merge from emacs-24 |
Date: |
Sat, 06 Dec 2014 10:36:31 +0200 |
2014-12-05 Paul Eggert <address@hidden>
2014-12-05 Eli Zaretskii <address@hidden>
* .gitignore: Ignore test/biditest.txt.
What happened here? Not that it was a significant contribution for
which I'd object sharing the credit with Paul, but there might be a
larger merging problem hiding behind this.
What am I missing?
- Strange ChangeLog entry after merge from emacs-24,
Eli Zaretskii <=