349
edits
No edit summary |
|||
Line 129: | Line 129: | ||
<li> pull from the main repository<br/> | <li> pull from the main repository<br/> | ||
<code>hg pull http://www.octave.org/hg/octave</code></li> | <code>hg pull http://www.octave.org/hg/octave</code></li> | ||
<li> | <li> move to the top of the main line of development and merge in the feature branch<br/> | ||
<code>hg | <code>hg up -r @</code><br/> | ||
<code>hg merge -r </code><br/> | |||
</li> | |||
</ol> </li> | </ol> </li> | ||
</ol> | </ol> |
edits