diff options
author | Eli Zaretskii <eliz@gnu.org> | 2010-05-18 10:38:35 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2010-05-18 10:38:35 +0300 |
commit | 5739cdd25a18f0057ff9334956f02ff79c46e957 (patch) | |
tree | f5eca4de85c84cd2fe2a4490c80550a9ef04dff5 /lisp/emacs-lisp/smie.el | |
parent | 9539dc5db33befba5aaed2bfa9e38d67a599d9f5 (diff) | |
download | emacs-5739cdd25a18f0057ff9334956f02ff79c46e957.tar.gz emacs-5739cdd25a18f0057ff9334956f02ff79c46e957.tar.bz2 emacs-5739cdd25a18f0057ff9334956f02ff79c46e957.zip |
Advise against unnecessary merges from trunk to feature branches.
Diffstat (limited to 'lisp/emacs-lisp/smie.el')
0 files changed, 0 insertions, 0 deletions