diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-12-01 22:00:02 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-12-01 22:00:02 -0500 |
| commit | 52097314c1a160be622dfcf9f40c33190a90be88 (patch) | |
| tree | f93b1bb526169ea5f360b0914c57b7aca9f38686 /test/lisp/emacs-lisp/tabulated-list-test.el | |
| parent | 1ed8ff2aa9e1aaee54a6cad38f4c9a595d6c19ed (diff) | |
| download | emacs-52097314c1a160be622dfcf9f40c33190a90be88.tar.gz emacs-52097314c1a160be622dfcf9f40c33190a90be88.tar.bz2 emacs-52097314c1a160be622dfcf9f40c33190a90be88.zip | |
* admin/gitmerge.el (gitmerge-resolve):
Fix treatment of generated files.
Diffstat (limited to 'test/lisp/emacs-lisp/tabulated-list-test.el')
0 files changed, 0 insertions, 0 deletions