Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
1851cac3
Commit
1851cac3
authored
Jan 13, 2011
by
Glenn Morris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* admin/bzrmerge.el: Require cl when compiling.
(bzrmerge-merges): Doc fix.
parent
fc55380c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
admin/ChangeLog
admin/ChangeLog
+5
-3
admin/bzrmerge.el
admin/bzrmerge.el
+4
-1
No files found.
admin/ChangeLog
View file @
1851cac3
2011-01-14 Glenn Morris <rgm@gnu.org>
* bzrmerge.el: Require cl when compiling.
(bzrmerge-merges): Doc fix.
2011-01-07 Paul Eggert <eggert@cs.ucla.edu>
* notes/copyright: There's only one install-sh, not two, so fix a
...
...
@@ -989,7 +994,6 @@
;; Local Variables:
;; coding: utf-8
;; add-log-time-zone-rule: t
;; End:
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
...
...
@@ -1009,5 +1013,3 @@
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; arch-tag: 97728c77-77c0-4156-b669-0e8c07d94e5a
admin/bzrmerge.el
View file @
1851cac3
...
...
@@ -24,8 +24,11 @@
;;; Code:
(
eval-when-compile
(
require
'cl
))
; assert
(
defun
bzrmerge-merges
()
"Return the list of already merged (not
no
t committed) revisions.
"Return the list of already merged (not
ye
t committed) revisions.
The list returned is sorted by oldest-first."
(
with-current-buffer
(
get-buffer-create
"*bzrmerge*"
)
(
erase-buffer
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment