<html dir="LTR"> <head> <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252" /> <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" /> <title>MergeHint Property</title> <xml> </xml> <link rel="stylesheet" type="text/css" href="MSDN.css" /> </head> <body id="bodyID" class="dtBODY"> <div id="nsbanner"> <div id="bannerrow1"> <table class="bannerparthead" cellspacing="0" id="Table1"> <tr id="hdr"> <td class="runninghead">Perforce API for the .Net CLR</td> <td class="product"><img alt="P4.Net" src="p4net.GIF" /></td> </tr> </table> </div> <div id="TitleRow"> <h1 class="dtH1">MergeData.MergeHint Property</h1> </div> </div> <div id="nstext"> <p> Perforce's recommended merge action. </p> <div class="syntax"> <span class="lang">[VisualBasic]</span> <br />PublicReadOnlyPropertyMergeHintAs<a href="P4API.MergeAction.html">MergeAction</a></div> <div class="syntax"> <span class="lang">[C#]</span> <br />public<a href="P4API.MergeAction.html">MergeAction</a>MergeHint{get;}</div> <p> </p> <h4 class="dtH4">See Also</h4> <p> <a href="P4API.MergeData.html">MergeData Class</a> | <a href="P4API.html">P4API Namespace</a></p> <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;"> <param name="Keyword" value="MergeHint property"> </param> <param name="Keyword" value="MergeHint property, MergeData class"> </param> <param name="Keyword" value="MergeData.MergeHint property"> </param> </object> <hr /> <div id="footer"> <p> <a href="Copyright.html">Copyright 2006 Shawn Hladky</a> </p> <p> </p> </div> </div> </body> </html>
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#1 | 7889 | Johan Nilsson |
Branch from Shawn Hladky's original P4.Net (main branch). Changed file type for StandardTest.cs and UnicodeTest.cs in order to be able to check them in. |
||
//guest/shawn_hladky/P4.Net/main/doc/html/P4API.MergeData.MergeHint.html | |||||
#1 | 7709 | Shawn Hladky | P4.Net: Cleanup, documentation, and a a start for implementing an object-based output for filelog. |