# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 2009-04-07 22:41:07
# Node ID e0c434abd530a60e6712ffd3ada6039715748f6c
# Parent  3aaca5901ade3eb9dd93ff21010145a81e5f9e42

notify, commands: word-wrap help strings

diff --git a/hgext/notify.py b/hgext/notify.py
--- a/hgext/notify.py
+++ b/hgext/notify.py
@@ -61,8 +61,8 @@ To use, configure notify extension and e
 
  glob patterns are matched against path to repository root.
 
- if you like, you can put notify config file in repository that users can
- push changes to, they can manage their own subscriptions.'''
+ if you like, you can put notify config file in repository that users
+ can push changes to, they can manage their own subscriptions.'''
 
 from mercurial.i18n import _
 from mercurial import patch, cmdutil, templater, util, mail
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2924,14 +2924,15 @@ def update(ui, repo, node=None, rev=None
     Use null as the revision to remove the working copy (like 'hg
     clone -U').
 
-    When the working directory contains no uncommitted changes, it will be
-    replaced by the state of the requested revision from the repository.
-    When the requested revision is on a different branch, the working
-    directory will additionally be switched to that branch.
+    When the working directory contains no uncommitted changes, it
+    will be replaced by the state of the requested revision from the
+    repository. When the requested revision is on a different branch,
+    the working directory will additionally be switched to that
+    branch.
 
     When there are uncommitted changes, use option -C to discard them,
-    forcibly replacing the state of the working directory with the requested
-    revision.
+    forcibly replacing the state of the working directory with the
+    requested revision.
 
     When there are uncommitted changes and option -C is not used, and
     the parent revision and requested revision are on the same branch,
diff --git a/tests/test-notify.out b/tests/test-notify.out
--- a/tests/test-notify.out
+++ b/tests/test-notify.out
@@ -54,8 +54,8 @@ To use, configure notify extension and e
 
  glob patterns are matched against path to repository root.
 
- if you like, you can put notify config file in repository that users can
- push changes to, they can manage their own subscriptions.
+ if you like, you can put notify config file in repository that users
+ can push changes to, they can manage their own subscriptions.
 
 no commands defined
 % commit