[Xen-changelog] manual merge

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxxx
# Node ID 32fb371cc283f4e146f2a23241a2287510fb78b2
# Parent  1c119c875f21dd24aae3b9d83aa3f34953d9bea4

# Parent  b237f032cee120f64dfbbbf08107b58b3d745220
manual merge

diff -r 1c119c875f21 -r 32fb371cc283 docs/misc/hg-cheatsheet.txt
--- a/docs/misc/hg-cheatsheet.txt       Wed Jul  6 18:56:55 2005
+++ b/docs/misc/hg-cheatsheet.txt       Wed Jul  6 18:57:54 2005
@@ -95,6 +95,8 @@
 repository from:
  
   
http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-unstable.hg.tar.gz
+
+  (or copy from /usr/groups/netos/html/xen/downloads/xen-unstable.hg.tar.gz)
 
 Untar the repository on your disk, cd into it, and then pull the most
 recent changes:
@@ -430,4 +432,7 @@
  you have two parents.  Otherwise, the single parent is the changeset
  which you most recently checked out.
 
-
+Show the revision history for a single file
+
+   hg [-v] log <filename>
+

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog