X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/76100140e796769ea59bca8a4dd3887982c605bf..2e4bf95d860da463a6b5f86e46a34462ef5449dd:/mr

diff --git a/mr b/mr
index e274670..a897a5f 100755
--- a/mr
+++ b/mr
@@ -221,11 +221,6 @@ a good speedup in updates without loading the machine too much.
 
 =head1 FILES
 
-The ~/.mrlog file contains commands that mr has remembered to run later,
-due to being offline. You can delete or edit this file to remove commands,
-or even to add other commands for 'mr online' to run. If the file is
-present, mr assumes it is in offline mode.
-
 B<mr> is configured by .mrconfig files. It starts by reading the .mrconfig
 file in your home directory, and this can in turn chain load .mrconfig files
 from repositories.
@@ -341,6 +336,11 @@ the action that is performed for a given revision control system, you can
 override these rcs specific actions. To add a new revision control system,
 you can just add rcs specific actions for it.
 
+The ~/.mrlog file contains commands that mr has remembered to run later,
+due to being offline. You can delete or edit this file to remove commands,
+or even to add other commands for 'mr online' to run. If the file is
+present, mr assumes it is in offline mode.
+
 =head1 EXTENSIONS
 
 mr can be extended to support things such as unison and git-svn. Some
@@ -1275,7 +1275,7 @@ git_bare_test =
 
 svn_update = svn update "$@"
 git_update = git pull "$@"
-bzr_update = bzr merge "$@"
+bzr_update = bzr merge --pull "$@"
 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"
 darcs_update = darcs pull -a "$@"