[PATCH] merge: Be precise about what merged into what in short desc

anatoly techtonik techtonik at gmail.com
Wed Nov 26 14:22:33 UTC 2014


# HG changeset patch
# User anatoly techtonik <techtonik at gmail.com>
# Date 1417011729 -10800
#      Wed Nov 26 17:22:09 2014 +0300
# Branch stable
# Node ID ef7bd889ba988435ce87fceb9a1bb72c46a97e9b
# Parent  6dfb78f18bdba03067c7060cbe5b4ca2e757dde9
merge: Be precise about what merged into what in short desc

diff -r 6dfb78f18bdb -r ef7bd889ba98 mercurial/commands.py
--- a/mercurial/commands.py	Sat Jul 26 09:27:11 2014 +0300
+++ b/mercurial/commands.py	Wed Nov 26 17:22:09 2014 +0300
@@ -4261,7 +4261,7 @@
      ] + mergetoolopts,
     _('[-P] [-f] [[-r] REV]'))
 def merge(ui, repo, node=None, **opts):
-    """merge working directory with another revision
+    """merge another revision into working directory
 
     The current working directory is updated with all changes made in
     the requested revision since the last common predecessor revision.


More information about the Mercurial-devel mailing list