hg.rst
changeset 885 49e12da19c2d
parent 861 a0a4d3b85923
child 886 9b179c44f835
--- 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
+