# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1248333324 14400
# Node ID ee24c2fdbfbaabb4fb206d2e9c20ce9b853e9183
# Parent  c9a86b8b497cdb4e5cab913a8625a51f7b29f0b4
Add documentation for {rev} and {rev|merge}.

diff -r c9a86b8b497c -r ee24c2fdbfba README
--- a/README	Thu Jul 23 03:13:55 2009 -0400
+++ b/README	Thu Jul 23 03:15:24 2009 -0400
@@ -59,6 +59,8 @@
 
 * **bookmark:** the current bookmark (requires the [bookmarks]() extension)
 * **branch:** the current branch
+* **rev:** the repository-local changeset number of the current parent.  This does not take into account merges (which have two parents) -- see the `rev|merge` keyword for that.
+* **rev|merge:** the repository-local changeset number of the changeset you're merging with if you're currently merging, otherwise nothing
 * **root:** the full path to the root of the current repository, without a trailing slash
 * **root|basename:** the directory name of the root of the current repository.  For example, if the repository is in `/home/u/myrepo` then this keyword would expand to `myrepo`.
 * **status:**  `!` if the repository has any changed/added/removed files, otherwise `?` if it has any untracked (but not ignored) files, otherwise nothing.
diff -r c9a86b8b497c -r ee24c2fdbfba prompt.py
--- a/prompt.py	Thu Jul 23 03:13:55 2009 -0400
+++ b/prompt.py	Thu Jul 23 03:15:24 2009 -0400
@@ -66,6 +66,11 @@
     
     - bookmark: the current bookmark (requires the bookmarks extension)
     - branch: the current branch
+    - rev: the repository-local changeset number of the current parent.  This
+        does not take into account merges (which have two parents) -- see the
+        'rev|merge' keyword for that.
+    - rev|merge: the repository-local changeset number of the changeset
+        you're merging with if you're currently merging, otherwise nothing
     - root: the full path to the root of the current repository, without a 
         trailing slash
     - root|basename: the directory name of the root of the current