summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2017-12-12 23:20:15 -0500
committerGlenn Morris <rgm@gnu.org>2017-12-12 23:20:15 -0500
commita93c8e36f0e17b4f209cd943e581f0141789450f (patch)
tree40e8bd0d5681918b32c9cef90b10d5b81955b6ef /lisp/emacs-lisp
parent14b95587520959c5b54356547a0a69932a9bb480 (diff)
downloademacs-a93c8e36f0e17b4f209cd943e581f0141789450f.tar.gz
emacs-a93c8e36f0e17b4f209cd943e581f0141789450f.tar.bz2
emacs-a93c8e36f0e17b4f209cd943e581f0141789450f.zip
* admin/gitmerge.el (gitmerge-missing):
Don't get confused by decorations.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions