[Emacs-diffs] /srv/bzr/emacs/trunk r102886: * admin/notes/bzr: Fix typos in previous.

[Glenn Morris]

------------------------------------------------------------
revno: 102886
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2011-01-17 18:57:04 -0800
message:
  * admin/notes/bzr: Fix typos in previous.
modified:
  admin/notes/bzr

=== modified file 'admin/notes/bzr'
--- a/admin/notes/bzr   2011-01-18 02:55:26 +0000
+++ b/admin/notes/bzr   2011-01-18 02:57:04 +0000
@@ -85,7 +85,7 @@
 6) After resolving all conflicts, you might need to run the bzmerge
 command again if there are more revisions still to merge.
 
-Do not commit (or exit Emacs) until you have run bzrmerge to compeltion.
+Do not commit (or exit Emacs) until you have run bzrmerge to completion.
 
 Before committing, check bzr status and bzr diff output.
 If you have run bzrmerge enough times, the "pending merge tip" in bzr
@@ -111,6 +111,6 @@
 
 3) Conflicts in autoload md5sums in comments.  Strictly speaking, the
 right thing to do is merge everything else, resolve the conflict by
-choosig either the trunk or branch version, then run `make -C lisp
+choosing either the trunk or branch version, then run `make -C lisp
 autoloads' to update the md5sums to the correct trunk value before
 committing.