equal
deleted
inserted
replaced
325 * Free Mercurial hosting. |
325 * Free Mercurial hosting. |
326 |
326 |
327 http://mercurial.selenic.com/wiki/MercurialHosting |
327 http://mercurial.selenic.com/wiki/MercurialHosting |
328 Free Hosting of Mercurial Repositories |
328 Free Hosting of Mercurial Repositories |
329 |
329 |
|
330 * Merge or rebase uncommitted changes. |
|
331 |
|
332 $ hg diff > .diff # save local changes |
|
333 $ hg revert -a |
|
334 $ hg fetch |
|
335 $ patch -p1 <.diff |
|
336 |
|
337 http://mercurial.selenic.com/wiki/TipsAndTricks#Merge_or_rebase_with_uncommitted_changes |
|
338 |