[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master updated (1ed8ff2 -> 0b6f4f2)
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master updated (1ed8ff2 -> 0b6f4f2) |
Date: |
Fri, 1 Dec 2017 22:07:02 -0500 (EST) |
gm pushed a change to branch master.
from 1ed8ff2 ; * doc/lispref/eval.texi (Deferred Eval): Improve
wording.
new 5209731 * admin/gitmerge.el (gitmerge-resolve): Fix treatment of
generated files.
new 7c95819 Don't hard-code gitmerge.el's default merge branch
new 0b6f4f2 * admin/gitmerge.el (gitmerge-resolve): Handle NEWS.
(Bug#29366)
Summary of changes:
admin/gitmerge.el | 80 +++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 60 insertions(+), 20 deletions(-)
- [Emacs-diffs] master updated (1ed8ff2 -> 0b6f4f2),
Glenn Morris <=