<html>
<head>
<base href="https://wiki.asterisk.org/wiki">
<link rel="stylesheet" href="/wiki/s/en/2176/25/9/_/styles/combined.css?spaceKey=AST&forWysiwyg=true" type="text/css">
</head>
<body style="background: white;" bgcolor="white" class="email-body">
<div id="pageContent">
<div id="notificationFormat">
<div class="wiki-content">
<div class="email">
<h2><a href="https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage?focusedCommentId=21463802#comment-21463802">Subversion Usage</a></h2>
<h4>Comment edited by <a href="https://wiki.asterisk.org/wiki/display/~mjordan">Matt Jordan</a>
:</h4>
<br/>
<h4>Changes (2)</h4>
<div id="page-diffs">
<table class="diff" cellpadding="0" cellspacing="0">
<tr><td class="diff-deleted-lines" style="color:#999;background-color:#fdd;text-decoration:line-through;">Its part of svnmerge, e.g., <br></td></tr>
<tr><td class="diff-added-lines" style="background-color: #dfd;">Its part of mergetool, which wraps around svnmerge. Example: <br></td></tr>
<tr><td class="diff-unchanged" > <br>{code} <br></td></tr>
<tr><td class="diff-snipped" >...<br></td></tr>
</table>
</div> <h4>Full Content</h4>
<div class="notificationGreySide">
<p>Its part of mergetool, which wraps around svnmerge. Example:</p>
<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
<pre class="theme: Confluence; brush: java; gutter: false">$ record810 345738
spawn /usr/local/bin/svnmerge.real merge --record-only -P branch-1.8-merged -B branch-1.8-blocked -f ../merge.msg -r 345738</pre>
</div></div>
</div>
<div id="commentsSection" class="wiki-content pageSection">
<div style="float: right;" class="grey">
<a href="https://wiki.asterisk.org/wiki/users/removespacenotification.action?spaceKey=AST">Stop watching space</a>
<span style="padding: 0px 5px;">|</span>
<a href="https://wiki.asterisk.org/wiki/users/editmyemailsettings.action">Change email notification preferences</a>
</div>
<a href="https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage?focusedCommentId=21463802#comment-21463802">View Online</a>
|
<a id="reply-21463802" href="https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage?replyToComment=21463802#comment-21463802">Reply To This</a>
</div>
</div>
</div>
</div>
</div>
</body>
</html>