diff options
| author | Glenn Morris | 2017-12-11 13:25:41 -0500 |
|---|---|---|
| committer | Glenn Morris | 2017-12-11 13:25:41 -0500 |
| commit | 1ef8e28cf8d2f42c9cef3dac8dccb283508ac481 (patch) | |
| tree | ff39a65784d3d9f8c353651a860b69a7d5b18d92 /src/bytecode.c | |
| parent | 786907238bcb86ab9e0e2e9ebcc91c52a6eb024c (diff) | |
| download | emacs-1ef8e28cf8d2f42c9cef3dac8dccb283508ac481.tar.gz emacs-1ef8e28cf8d2f42c9cef3dac8dccb283508ac481.zip | |
* admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.
Diffstat (limited to 'src/bytecode.c')
0 files changed, 0 insertions, 0 deletions