# HG changeset patch # User Glenn Morris # Date 1295319424 28800 # Node ID e4640e51ea08b811ff94acde89d90a14155a4cb8 # Parent 49c0a3b6d6240ea17aef4681c3f2275fd4a1044c * admin/notes/bzr: Fix typos in previous. diff -r 49c0a3b6d624 -r e4640e51ea08 admin/notes/bzr --- a/admin/notes/bzr Mon Jan 17 18:55:26 2011 -0800 +++ b/admin/notes/bzr Mon Jan 17 18:57:04 2011 -0800 @@ -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.