changeset 886 | 9b179c44f835 |
parent 885 | 49e12da19c2d |
child 894 | d7b21de5bb44 |
885:49e12da19c2d | 886:9b179c44f835 |
---|---|
333 $ hg revert -a |
333 $ hg revert -a |
334 $ hg fetch |
334 $ hg fetch |
335 $ patch -p1 <.diff |
335 $ patch -p1 <.diff |
336 |
336 |
337 http://mercurial.selenic.com/wiki/TipsAndTricks#Merge_or_rebase_with_uncommitted_changes |
337 http://mercurial.selenic.com/wiki/TipsAndTricks#Merge_or_rebase_with_uncommitted_changes |
338 |
338 http://mercurial.selenic.com/wiki/ShelveExtension |
339 |