# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1308555840 -10800
# Node ID 302014546fbb2b57de58446c243fd67259b6b1c7
# Parent  7eee0fbd837e2dcb2f7df3574db59ec60a3aebfd# Parent  9b179c44f8359191bae22310cc22edbb16d19274
merged

diff -r 7eee0fbd837e -r 302014546fbb hg.rst
--- a/hg.rst	Sun Jun 19 17:27:34 2011 +0300
+++ b/hg.rst	Mon Jun 20 10:44:00 2011 +0300
@@ -327,3 +327,13 @@
   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
+  http://mercurial.selenic.com/wiki/ShelveExtension
+
diff -r 7eee0fbd837e -r 302014546fbb windows-devel.rst
--- a/windows-devel.rst	Sun Jun 19 17:27:34 2011 +0300
+++ b/windows-devel.rst	Mon Jun 20 10:44:00 2011 +0300
@@ -56,6 +56,10 @@
 'bp', 'bm' commands sets software breakpoints, debugger replaces the processor instruction with a
 break instruction.
 
+** Clear breakpoints.
+
+  bc *
+
 ** How to set WinDbg as a Default Windows Postmortem Debugger.
 
   cmd> WinDbg -I
@@ -83,6 +87,10 @@
 
   symchk /r c:\windows\system32 /s SRV*c:\symbols\*http://msdl.microsoft.com/download/symbols
 
+** Debugging child process.
+
+  .childdbg 1
+
 * Running at startup.
 
   HKCU\Software\Microsoft\Windows\CurrentVersion\Run