Mercurial > emacs

comparison admin/notes/bzr @ 112274:60871b0684c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* admin/notes/bzr: More on previous.
author Glenn Morris <rgm@gnu.org>
date Sat, 15 Jan 2011 13:51:36 -0800
parents d074b0e8afef
children aee2f052ef17
comparison
equal deleted inserted replaced
112273:d074b0e8afef 112274:60871b0684c4
65 again if there are more revisions still to merge. 65 again if there are more revisions still to merge.
66 You can commit either before you do this (eg if you had a lot of 66 You can commit either before you do this (eg if you had a lot of
67 conflicts to resolve and don't want to get confused), or refrain from 67 conflicts to resolve and don't want to get confused), or refrain from
68 committing until bzrmerge has merged all revisions. 68 committing until bzrmerge has merged all revisions.
69 69
70 Before committing, check bzr status and bzr diff output.
71
72 Note that ChangeLog entries are automatically merged to the top with
73 today's date, but you still might want to check them to see that too
74 much is not being included.