diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-01-15 12:43:16 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-01-15 12:43:16 -0800 |
| commit | 7d6a6b4a4c701b7900809e6209de42f2dc14e1e3 (patch) | |
| tree | 2b19b78e188c21758a6202ebb555c73b913636ca /lisp/emacs-lisp/ring.el | |
| parent | 597ede7e5b3c965f1653d15c964e86ccb989a62f (diff) | |
| download | emacs-7d6a6b4a4c701b7900809e6209de42f2dc14e1e3.tar.gz emacs-7d6a6b4a4c701b7900809e6209de42f2dc14e1e3.tar.bz2 emacs-7d6a6b4a4c701b7900809e6209de42f2dc14e1e3.zip | |
Small improvement for noninteractive gitmerge
* admin/gitmerge.el (gitmerge-resolve-unmerged):
In batch mode, report conflicted files.
Diffstat (limited to 'lisp/emacs-lisp/ring.el')
0 files changed, 0 insertions, 0 deletions