# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1308224258 -10800
# Node ID 49e12da19c2d7b179ada5b0316dcb0aa524f2d9b
# Parent  b94da2c4bee16c58f2797c23755e379039a02293
Merge or rebase uncommitted changes.

diff -r b94da2c4bee1 -r 49e12da19c2d hg.rst
--- a/hg.rst	Wed Jun 15 11:55:57 2011 +0300
+++ b/hg.rst	Thu Jun 16 14:37:38 2011 +0300
@@ -327,3 +327,12 @@
   http://mercurial.selenic.com/wiki/MercurialHosting
                 Free Hosting of Mercurial Repositories
 
+* Merge or rebase uncommitted changes.
+
+  $ hg diff > .diff   # save local changes
+  $ hg revert -a
+  $ hg fetch
+  $ patch -p1 <.diff
+
+  http://mercurial.selenic.com/wiki/TipsAndTricks#Merge_or_rebase_with_uncommitted_changes
+