convert merge notes
This commit is contained in:
Hubird.au
parent
ecc763ed3c
commit
0ed8bd0fa5
845
docs/Windows_merge_notes.htm
Normal file
845
docs/Windows_merge_notes.htm
Normal file
@ -0,0 +1,845 @@
|
||||
<html xmlns:v="urn:schemas-microsoft-com:vml"
|
||||
xmlns:o="urn:schemas-microsoft-com:office:office"
|
||||
xmlns:w="urn:schemas-microsoft-com:office:word"
|
||||
xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
|
||||
xmlns="http://www.w3.org/TR/REC-html40">
|
||||
|
||||
<head>
|
||||
<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
|
||||
<meta name=ProgId content=Word.Document>
|
||||
<meta name=Generator content="Microsoft Word 12">
|
||||
<meta name=Originator content="Microsoft Word 12">
|
||||
<link rel=File-List href="Windows_merge_notes_files/filelist.xml">
|
||||
<link rel=Edit-Time-Data href="Windows_merge_notes_files/editdata.mso">
|
||||
<!--[if !mso]>
|
||||
<style>
|
||||
v\:* {behavior:url(#default#VML);}
|
||||
o\:* {behavior:url(#default#VML);}
|
||||
w\:* {behavior:url(#default#VML);}
|
||||
.shape {behavior:url(#default#VML);}
|
||||
</style>
|
||||
<![endif]--><!--[if gte mso 9]><xml>
|
||||
<o:DocumentProperties>
|
||||
<o:Author>Mike</o:Author>
|
||||
<o:LastAuthor>Mike</o:LastAuthor>
|
||||
<o:Revision>2</o:Revision>
|
||||
<o:TotalTime>14</o:TotalTime>
|
||||
<o:Created>2010-08-12T11:33:00Z</o:Created>
|
||||
<o:LastSaved>2010-08-12T11:33:00Z</o:LastSaved>
|
||||
<o:Pages>4</o:Pages>
|
||||
<o:Words>420</o:Words>
|
||||
<o:Characters>2398</o:Characters>
|
||||
<o:Lines>19</o:Lines>
|
||||
<o:Paragraphs>5</o:Paragraphs>
|
||||
<o:CharactersWithSpaces>2813</o:CharactersWithSpaces>
|
||||
<o:Version>12.00</o:Version>
|
||||
</o:DocumentProperties>
|
||||
</xml><![endif]-->
|
||||
<link rel=dataStoreItem href="Windows_merge_notes_files/item0001.xml"
|
||||
target="Windows_merge_notes_files/props0002.xml">
|
||||
<link rel=themeData href="Windows_merge_notes_files/themedata.thmx">
|
||||
<link rel=colorSchemeMapping
|
||||
href="Windows_merge_notes_files/colorschememapping.xml">
|
||||
<!--[if gte mso 9]><xml>
|
||||
<w:WordDocument>
|
||||
<w:TrackMoves>false</w:TrackMoves>
|
||||
<w:TrackFormatting/>
|
||||
<w:PunctuationKerning/>
|
||||
<w:ValidateAgainstSchemas/>
|
||||
<w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
|
||||
<w:IgnoreMixedContent>false</w:IgnoreMixedContent>
|
||||
<w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
|
||||
<w:DoNotPromoteQF/>
|
||||
<w:LidThemeOther>EN-AU</w:LidThemeOther>
|
||||
<w:LidThemeAsian>X-NONE</w:LidThemeAsian>
|
||||
<w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>
|
||||
<w:Compatibility>
|
||||
<w:BreakWrappedTables/>
|
||||
<w:SnapToGridInCell/>
|
||||
<w:WrapTextWithPunct/>
|
||||
<w:UseAsianBreakRules/>
|
||||
<w:DontGrowAutofit/>
|
||||
<w:DontUseIndentAsNumberingTabStop/>
|
||||
<w:FELineBreak11/>
|
||||
<w:WW11IndentRules/>
|
||||
<w:DontAutofitConstrainedTables/>
|
||||
<w:AutofitLikeWW11/>
|
||||
<w:HangulWidthLikeWW11/>
|
||||
<w:UseNormalStyleForList/>
|
||||
</w:Compatibility>
|
||||
<m:mathPr>
|
||||
<m:mathFont m:val="Cambria Math"/>
|
||||
<m:brkBin m:val="before"/>
|
||||
<m:brkBinSub m:val="--"/>
|
||||
<m:smallFrac m:val="off"/>
|
||||
<m:dispDef/>
|
||||
<m:lMargin m:val="0"/>
|
||||
<m:rMargin m:val="0"/>
|
||||
<m:defJc m:val="centerGroup"/>
|
||||
<m:wrapIndent m:val="1440"/>
|
||||
<m:intLim m:val="subSup"/>
|
||||
<m:naryLim m:val="undOvr"/>
|
||||
</m:mathPr></w:WordDocument>
|
||||
</xml><![endif]--><!--[if gte mso 9]><xml>
|
||||
<w:LatentStyles DefLockedState="false" DefUnhideWhenUsed="true"
|
||||
DefSemiHidden="true" DefQFormat="false" DefPriority="99"
|
||||
LatentStyleCount="267">
|
||||
<w:LsdException Locked="false" Priority="0" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="Normal"/>
|
||||
<w:LsdException Locked="false" Priority="9" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="heading 1"/>
|
||||
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 2"/>
|
||||
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 3"/>
|
||||
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 4"/>
|
||||
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 5"/>
|
||||
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 6"/>
|
||||
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 7"/>
|
||||
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 8"/>
|
||||
<w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 9"/>
|
||||
<w:LsdException Locked="false" Priority="39" Name="toc 1"/>
|
||||
<w:LsdException Locked="false" Priority="39" Name="toc 2"/>
|
||||
<w:LsdException Locked="false" Priority="39" Name="toc 3"/>
|
||||
<w:LsdException Locked="false" Priority="39" Name="toc 4"/>
|
||||
<w:LsdException Locked="false" Priority="39" Name="toc 5"/>
|
||||
<w:LsdException Locked="false" Priority="39" Name="toc 6"/>
|
||||
<w:LsdException Locked="false" Priority="39" Name="toc 7"/>
|
||||
<w:LsdException Locked="false" Priority="39" Name="toc 8"/>
|
||||
<w:LsdException Locked="false" Priority="39" Name="toc 9"/>
|
||||
<w:LsdException Locked="false" Priority="35" QFormat="true" Name="caption"/>
|
||||
<w:LsdException Locked="false" Priority="10" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="Title"/>
|
||||
<w:LsdException Locked="false" Priority="1" Name="Default Paragraph Font"/>
|
||||
<w:LsdException Locked="false" Priority="11" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="Subtitle"/>
|
||||
<w:LsdException Locked="false" Priority="22" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="Strong"/>
|
||||
<w:LsdException Locked="false" Priority="20" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="Emphasis"/>
|
||||
<w:LsdException Locked="false" Priority="59" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Table Grid"/>
|
||||
<w:LsdException Locked="false" UnhideWhenUsed="false" Name="Placeholder Text"/>
|
||||
<w:LsdException Locked="false" Priority="1" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="No Spacing"/>
|
||||
<w:LsdException Locked="false" Priority="60" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Shading"/>
|
||||
<w:LsdException Locked="false" Priority="61" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light List"/>
|
||||
<w:LsdException Locked="false" Priority="62" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Grid"/>
|
||||
<w:LsdException Locked="false" Priority="63" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 1"/>
|
||||
<w:LsdException Locked="false" Priority="64" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 2"/>
|
||||
<w:LsdException Locked="false" Priority="65" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 1"/>
|
||||
<w:LsdException Locked="false" Priority="66" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 2"/>
|
||||
<w:LsdException Locked="false" Priority="67" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 1"/>
|
||||
<w:LsdException Locked="false" Priority="68" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 2"/>
|
||||
<w:LsdException Locked="false" Priority="69" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 3"/>
|
||||
<w:LsdException Locked="false" Priority="70" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Dark List"/>
|
||||
<w:LsdException Locked="false" Priority="71" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Shading"/>
|
||||
<w:LsdException Locked="false" Priority="72" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful List"/>
|
||||
<w:LsdException Locked="false" Priority="73" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Grid"/>
|
||||
<w:LsdException Locked="false" Priority="60" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Shading Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="61" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light List Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="62" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Grid Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="63" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 1 Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="64" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 2 Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="65" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 1 Accent 1"/>
|
||||
<w:LsdException Locked="false" UnhideWhenUsed="false" Name="Revision"/>
|
||||
<w:LsdException Locked="false" Priority="34" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="List Paragraph"/>
|
||||
<w:LsdException Locked="false" Priority="29" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="Quote"/>
|
||||
<w:LsdException Locked="false" Priority="30" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="Intense Quote"/>
|
||||
<w:LsdException Locked="false" Priority="66" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 2 Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="67" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 1 Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="68" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 2 Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="69" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 3 Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="70" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Dark List Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="71" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Shading Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="72" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful List Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="73" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Grid Accent 1"/>
|
||||
<w:LsdException Locked="false" Priority="60" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Shading Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="61" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light List Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="62" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Grid Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="63" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 1 Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="64" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 2 Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="65" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 1 Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="66" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 2 Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="67" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 1 Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="68" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 2 Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="69" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 3 Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="70" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Dark List Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="71" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Shading Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="72" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful List Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="73" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Grid Accent 2"/>
|
||||
<w:LsdException Locked="false" Priority="60" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Shading Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="61" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light List Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="62" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Grid Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="63" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 1 Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="64" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 2 Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="65" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 1 Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="66" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 2 Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="67" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 1 Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="68" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 2 Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="69" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 3 Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="70" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Dark List Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="71" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Shading Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="72" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful List Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="73" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Grid Accent 3"/>
|
||||
<w:LsdException Locked="false" Priority="60" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Shading Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="61" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light List Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="62" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Grid Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="63" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 1 Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="64" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 2 Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="65" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 1 Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="66" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 2 Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="67" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 1 Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="68" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 2 Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="69" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 3 Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="70" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Dark List Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="71" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Shading Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="72" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful List Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="73" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Grid Accent 4"/>
|
||||
<w:LsdException Locked="false" Priority="60" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Shading Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="61" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light List Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="62" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Grid Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="63" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 1 Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="64" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 2 Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="65" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 1 Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="66" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 2 Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="67" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 1 Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="68" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 2 Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="69" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 3 Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="70" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Dark List Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="71" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Shading Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="72" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful List Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="73" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Grid Accent 5"/>
|
||||
<w:LsdException Locked="false" Priority="60" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Shading Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="61" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light List Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="62" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Light Grid Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="63" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 1 Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="64" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Shading 2 Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="65" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 1 Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="66" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium List 2 Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="67" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 1 Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="68" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 2 Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="69" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Medium Grid 3 Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="70" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Dark List Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="71" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Shading Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="72" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful List Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="73" SemiHidden="false"
|
||||
UnhideWhenUsed="false" Name="Colorful Grid Accent 6"/>
|
||||
<w:LsdException Locked="false" Priority="19" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="Subtle Emphasis"/>
|
||||
<w:LsdException Locked="false" Priority="21" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="Intense Emphasis"/>
|
||||
<w:LsdException Locked="false" Priority="31" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="Subtle Reference"/>
|
||||
<w:LsdException Locked="false" Priority="32" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="Intense Reference"/>
|
||||
<w:LsdException Locked="false" Priority="33" SemiHidden="false"
|
||||
UnhideWhenUsed="false" QFormat="true" Name="Book Title"/>
|
||||
<w:LsdException Locked="false" Priority="37" Name="Bibliography"/>
|
||||
<w:LsdException Locked="false" Priority="39" QFormat="true" Name="TOC Heading"/>
|
||||
</w:LatentStyles>
|
||||
</xml><![endif]-->
|
||||
<style>
|
||||
<!--
|
||||
/* Font Definitions */
|
||||
@font-face
|
||||
{font-family:Wingdings;
|
||||
panose-1:5 0 0 0 0 0 0 0 0 0;
|
||||
mso-font-charset:2;
|
||||
mso-generic-font-family:auto;
|
||||
mso-font-pitch:variable;
|
||||
mso-font-signature:0 268435456 0 0 -2147483648 0;}
|
||||
@font-face
|
||||
{font-family:"Cambria Math";
|
||||
panose-1:2 4 5 3 5 4 6 3 2 4;
|
||||
mso-font-charset:0;
|
||||
mso-generic-font-family:roman;
|
||||
mso-font-pitch:variable;
|
||||
mso-font-signature:-1610611985 1107304683 0 0 415 0;}
|
||||
@font-face
|
||||
{font-family:Calibri;
|
||||
panose-1:2 15 5 2 2 2 4 3 2 4;
|
||||
mso-font-charset:0;
|
||||
mso-generic-font-family:swiss;
|
||||
mso-font-pitch:variable;
|
||||
mso-font-signature:-520092929 1073786111 9 0 415 0;}
|
||||
@font-face
|
||||
{font-family:Tahoma;
|
||||
panose-1:2 11 6 4 3 5 4 4 2 4;
|
||||
mso-font-charset:0;
|
||||
mso-generic-font-family:swiss;
|
||||
mso-font-pitch:variable;
|
||||
mso-font-signature:-520081665 -1073717157 41 0 66047 0;}
|
||||
@font-face
|
||||
{font-family:"Arial Black";
|
||||
panose-1:2 11 10 4 2 1 2 2 2 4;
|
||||
mso-font-charset:0;
|
||||
mso-generic-font-family:swiss;
|
||||
mso-font-pitch:variable;
|
||||
mso-font-signature:647 0 0 0 159 0;}
|
||||
/* Style Definitions */
|
||||
p.MsoNormal, li.MsoNormal, div.MsoNormal
|
||||
{mso-style-unhide:no;
|
||||
mso-style-qformat:yes;
|
||||
mso-style-parent:"";
|
||||
margin-top:0cm;
|
||||
margin-right:0cm;
|
||||
margin-bottom:10.0pt;
|
||||
margin-left:0cm;
|
||||
line-height:115%;
|
||||
mso-pagination:widow-orphan;
|
||||
font-size:11.0pt;
|
||||
font-family:"Calibri","sans-serif";
|
||||
mso-fareast-font-family:Calibri;
|
||||
mso-bidi-font-family:"Times New Roman";
|
||||
color:#7F7F7F;
|
||||
mso-fareast-language:EN-US;
|
||||
font-style:italic;
|
||||
mso-bidi-font-style:normal;}
|
||||
p.MsoHeader, li.MsoHeader, div.MsoHeader
|
||||
{mso-style-noshow:yes;
|
||||
mso-style-priority:99;
|
||||
mso-style-link:"Header Char";
|
||||
margin:0cm;
|
||||
margin-bottom:.0001pt;
|
||||
mso-pagination:widow-orphan;
|
||||
tab-stops:center 225.65pt right 451.3pt;
|
||||
font-size:11.0pt;
|
||||
font-family:"Calibri","sans-serif";
|
||||
mso-fareast-font-family:Calibri;
|
||||
mso-bidi-font-family:"Times New Roman";
|
||||
color:#7F7F7F;
|
||||
mso-fareast-language:EN-US;
|
||||
font-style:italic;
|
||||
mso-bidi-font-style:normal;}
|
||||
p.MsoFooter, li.MsoFooter, div.MsoFooter
|
||||
{mso-style-noshow:yes;
|
||||
mso-style-priority:99;
|
||||
mso-style-link:"Footer Char";
|
||||
margin:0cm;
|
||||
margin-bottom:.0001pt;
|
||||
mso-pagination:widow-orphan;
|
||||
tab-stops:center 225.65pt right 451.3pt;
|
||||
font-size:11.0pt;
|
||||
font-family:"Calibri","sans-serif";
|
||||
mso-fareast-font-family:Calibri;
|
||||
mso-bidi-font-family:"Times New Roman";
|
||||
color:#7F7F7F;
|
||||
mso-fareast-language:EN-US;
|
||||
font-style:italic;
|
||||
mso-bidi-font-style:normal;}
|
||||
a:link, span.MsoHyperlink
|
||||
{mso-style-priority:99;
|
||||
color:blue;
|
||||
text-decoration:underline;
|
||||
text-underline:single;}
|
||||
a:visited, span.MsoHyperlinkFollowed
|
||||
{mso-style-noshow:yes;
|
||||
mso-style-priority:99;
|
||||
color:purple;
|
||||
mso-themecolor:followedhyperlink;
|
||||
text-decoration:underline;
|
||||
text-underline:single;}
|
||||
p
|
||||
{mso-style-noshow:yes;
|
||||
mso-style-priority:99;
|
||||
mso-margin-top-alt:auto;
|
||||
margin-right:0cm;
|
||||
mso-margin-bottom-alt:auto;
|
||||
margin-left:0cm;
|
||||
mso-pagination:widow-orphan;
|
||||
font-size:12.0pt;
|
||||
font-family:"Times New Roman","serif";
|
||||
mso-fareast-font-family:"Times New Roman";
|
||||
color:#7F7F7F;
|
||||
font-style:italic;
|
||||
mso-bidi-font-style:normal;}
|
||||
p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
|
||||
{mso-style-noshow:yes;
|
||||
mso-style-priority:99;
|
||||
mso-style-link:"Balloon Text Char";
|
||||
margin:0cm;
|
||||
margin-bottom:.0001pt;
|
||||
mso-pagination:widow-orphan;
|
||||
font-size:8.0pt;
|
||||
font-family:"Tahoma","sans-serif";
|
||||
mso-fareast-font-family:Calibri;
|
||||
color:#7F7F7F;
|
||||
mso-fareast-language:EN-US;
|
||||
font-style:italic;
|
||||
mso-bidi-font-style:normal;}
|
||||
span.BalloonTextChar
|
||||
{mso-style-name:"Balloon Text Char";
|
||||
mso-style-noshow:yes;
|
||||
mso-style-priority:99;
|
||||
mso-style-unhide:no;
|
||||
mso-style-locked:yes;
|
||||
mso-style-link:"Balloon Text";
|
||||
mso-ansi-font-size:8.0pt;
|
||||
mso-bidi-font-size:8.0pt;
|
||||
font-family:"Tahoma","sans-serif";
|
||||
mso-ascii-font-family:Tahoma;
|
||||
mso-hansi-font-family:Tahoma;
|
||||
mso-bidi-font-family:Tahoma;}
|
||||
span.HeaderChar
|
||||
{mso-style-name:"Header Char";
|
||||
mso-style-noshow:yes;
|
||||
mso-style-priority:99;
|
||||
mso-style-unhide:no;
|
||||
mso-style-locked:yes;
|
||||
mso-style-link:Header;
|
||||
color:#7F7F7F;
|
||||
font-style:italic;
|
||||
mso-bidi-font-style:normal;}
|
||||
span.FooterChar
|
||||
{mso-style-name:"Footer Char";
|
||||
mso-style-noshow:yes;
|
||||
mso-style-priority:99;
|
||||
mso-style-unhide:no;
|
||||
mso-style-locked:yes;
|
||||
mso-style-link:Footer;
|
||||
color:#7F7F7F;
|
||||
font-style:italic;
|
||||
mso-bidi-font-style:normal;}
|
||||
.MsoChpDefault
|
||||
{mso-style-type:export-only;
|
||||
mso-default-props:yes;
|
||||
mso-ascii-font-family:Calibri;
|
||||
mso-fareast-font-family:Calibri;
|
||||
mso-hansi-font-family:Calibri;}
|
||||
/* Page Definitions */
|
||||
@page
|
||||
{mso-footnote-separator:url("Windows_merge_notes_files/header.htm") fs;
|
||||
mso-footnote-continuation-separator:url("Windows_merge_notes_files/header.htm") fcs;
|
||||
mso-endnote-separator:url("Windows_merge_notes_files/header.htm") es;
|
||||
mso-endnote-continuation-separator:url("Windows_merge_notes_files/header.htm") ecs;}
|
||||
@page WordSection1
|
||||
{size:595.3pt 841.9pt;
|
||||
margin:72.0pt 72.0pt 72.0pt 72.0pt;
|
||||
mso-header-margin:35.4pt;
|
||||
mso-footer-margin:35.4pt;
|
||||
mso-paper-source:0;}
|
||||
div.WordSection1
|
||||
{page:WordSection1;}
|
||||
/* List Definitions */
|
||||
@list l0
|
||||
{mso-list-id:1119104315;
|
||||
mso-list-template-ids:1105878;}
|
||||
@list l0:level1
|
||||
{mso-level-number-format:bullet;
|
||||
mso-level-text:\F0B7;
|
||||
mso-level-tab-stop:36.0pt;
|
||||
mso-level-number-position:left;
|
||||
text-indent:-18.0pt;
|
||||
mso-ansi-font-size:10.0pt;
|
||||
font-family:Symbol;}
|
||||
ol
|
||||
{margin-bottom:0cm;}
|
||||
ul
|
||||
{margin-bottom:0cm;}
|
||||
-->
|
||||
</style>
|
||||
<!--[if gte mso 10]>
|
||||
<style>
|
||||
/* Style Definitions */
|
||||
table.MsoNormalTable
|
||||
{mso-style-name:"Table Normal";
|
||||
mso-tstyle-rowband-size:0;
|
||||
mso-tstyle-colband-size:0;
|
||||
mso-style-noshow:yes;
|
||||
mso-style-priority:99;
|
||||
mso-style-qformat:yes;
|
||||
mso-style-parent:"";
|
||||
mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
|
||||
mso-para-margin:0cm;
|
||||
mso-para-margin-bottom:.0001pt;
|
||||
mso-pagination:widow-orphan;
|
||||
font-size:10.0pt;
|
||||
font-family:"Calibri","sans-serif";
|
||||
mso-bidi-font-family:"Times New Roman";}
|
||||
</style>
|
||||
<![endif]--><!--[if gte mso 9]><xml>
|
||||
<o:shapedefaults v:ext="edit" spidmax="3074"/>
|
||||
</xml><![endif]--><!--[if gte mso 9]><xml>
|
||||
<o:shapelayout v:ext="edit">
|
||||
<o:idmap v:ext="edit" data="1"/>
|
||||
</o:shapelayout></xml><![endif]-->
|
||||
</head>
|
||||
|
||||
<body lang=EN-AU link=blue vlink=purple style='tab-interval:36.0pt'>
|
||||
|
||||
<div class=WordSection1>
|
||||
|
||||
<p class=MsoNormal><span style='font-family:"Times New Roman","serif";
|
||||
color:windowtext;font-style:normal'>First off I want to stress that I am by no
|
||||
means an expert on this but I thought I would try to share my experiences with
|
||||
others (specifically Windows users contributing to the</span><span
|
||||
style='font-family:"Times New Roman","serif";font-style:normal'> <a
|
||||
href="http://www.fanboy.co.nz/adblock/">Fanboy adblock list</a> </span><span
|
||||
style='font-family:"Times New Roman","serif";color:windowtext;font-style:normal'>project).<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><o:p> </o:p></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-family:"Times New Roman","serif";
|
||||
color:windowtext'>Tools needed:<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-family:"Times New Roman","serif"'><a
|
||||
href="http://tortoisehg.bitbucket.org/about.html">TortoiseHg</a><o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:8.0pt;line-height:115%;font-family:
|
||||
"Times New Roman","serif"'><o:p> </o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-family:"Times New Roman","serif"'>“TortoiseHg
|
||||
is a Windows shell extension and a series of applications for the Mercurial
|
||||
distributed revision control system.”<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><o:p> </o:p></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Arial Black","sans-serif";color:windowtext;
|
||||
font-style:normal'>Note: If you are reading this I’m assuming that you are
|
||||
already able to commit changes to the repository.<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Arial Black","sans-serif";color:windowtext;
|
||||
font-style:normal'><o:p> </o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>After<span style='mso-spacerun:yes'> </span>pushing changes
|
||||
made to one or more files in your local repository you should see a message
|
||||
that looks something like the following screenshot.<span
|
||||
style='mso-spacerun:yes'> </span><o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
mso-fareast-language:EN-AU;font-style:normal;mso-no-proof:yes'><!--[if gte vml 1]><v:shapetype
|
||||
id="_x0000_t75" coordsize="21600,21600" o:spt="75" o:preferrelative="t"
|
||||
path="m@4@5l@4@11@9@11@9@5xe" filled="f" stroked="f">
|
||||
<v:stroke joinstyle="miter"/>
|
||||
<v:formulas>
|
||||
<v:f eqn="if lineDrawn pixelLineWidth 0"/>
|
||||
<v:f eqn="sum @0 1 0"/>
|
||||
<v:f eqn="sum 0 0 @1"/>
|
||||
<v:f eqn="prod @2 1 2"/>
|
||||
<v:f eqn="prod @3 21600 pixelWidth"/>
|
||||
<v:f eqn="prod @3 21600 pixelHeight"/>
|
||||
<v:f eqn="sum @0 0 1"/>
|
||||
<v:f eqn="prod @6 1 2"/>
|
||||
<v:f eqn="prod @7 21600 pixelWidth"/>
|
||||
<v:f eqn="sum @8 21600 0"/>
|
||||
<v:f eqn="prod @7 21600 pixelHeight"/>
|
||||
<v:f eqn="sum @10 21600 0"/>
|
||||
</v:formulas>
|
||||
<v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
|
||||
<o:lock v:ext="edit" aspectratio="t"/>
|
||||
</v:shapetype><v:shape id="Picture_x0020_14" o:spid="_x0000_i1025" type="#_x0000_t75"
|
||||
alt="no merge.png" style='width:451.5pt;height:3in;visibility:visible'>
|
||||
<v:imagedata src="Windows_merge_notes_files/image001.png" o:title="no merge"/>
|
||||
</v:shape><![endif]--><![if !vml]><img border=0 width=602 height=288
|
||||
src="Windows_merge_notes_files/image002.jpg" alt="no merge.png" v:shapes="Picture_x0020_14"><![endif]></span><span
|
||||
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;line-height:115%;font-family:
|
||||
"Times New Roman","serif";color:windowtext;font-style:normal'><o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>The above is an example of the message you will get if no
|
||||
merging was required.<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'><o:p> </o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'><o:p> </o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'><o:p> </o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'><o:p> </o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'><o:p> </o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>In this next screen shot you will notice that a different
|
||||
message is displayed. If you see this message it means you will have to merge
|
||||
your changes (changes have been added as an additional head to our repository).
|
||||
If you do not merge your changes things will start to get confusing & messy
|
||||
real quick.<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
mso-fareast-language:EN-AU;font-style:normal;mso-no-proof:yes'><!--[if gte vml 1]><v:shape
|
||||
id="Picture_x0020_16" o:spid="_x0000_i1030" type="#_x0000_t75" alt="merge1.png"
|
||||
style='width:451.5pt;height:198.75pt;visibility:visible'>
|
||||
<v:imagedata src="Windows_merge_notes_files/image003.png" o:title="merge1"/>
|
||||
</v:shape><![endif]--><![if !vml]><img border=0 width=602 height=265
|
||||
src="Windows_merge_notes_files/image004.gif" alt=merge1.png v:shapes="Picture_x0020_16"><![endif]></span><span
|
||||
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;line-height:115%;font-family:
|
||||
"Times New Roman","serif";color:windowtext;font-style:normal'><o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><b style='mso-bidi-font-weight:normal'><span
|
||||
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;line-height:115%;font-family:
|
||||
"Arial Black","sans-serif";color:windowtext;font-style:normal'>Merging:<o:p></o:p></span></b></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>At the command prompt (make sure you are in the correct
|
||||
directory) type:<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><b style='mso-bidi-font-weight:normal'><span
|
||||
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;line-height:115%;font-family:
|
||||
"Times New Roman","serif";color:#1F497D;font-style:normal'>hg merge<o:p></o:p></span></b></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>Upon pressing enter you will be presented with a screen that
|
||||
looks something like this:<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
mso-fareast-language:EN-AU;font-style:normal;mso-no-proof:yes'><!--[if gte vml 1]><v:shape
|
||||
id="Picture_x0020_17" o:spid="_x0000_i1031" type="#_x0000_t75" alt="merge2.png"
|
||||
style='width:520.5pt;height:334.5pt;visibility:visible'>
|
||||
<v:imagedata src="Windows_merge_notes_files/image005.png" o:title="merge2"/>
|
||||
</v:shape><![endif]--><![if !vml]><img border=0 width=694 height=446
|
||||
src="Windows_merge_notes_files/image006.jpg" alt=merge2.png v:shapes="Picture_x0020_17"><![endif]></span><span
|
||||
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;line-height:115%;font-family:
|
||||
"Times New Roman","serif";color:windowtext;font-style:normal'><o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>You will notice you have 3 columns up the top labelled “A, B
|
||||
& C” and one down the bottom called “Output”. The 3 columns up the top
|
||||
cannot be modified and are for your reference only.<span
|
||||
style='mso-spacerun:yes'> </span>Changes between the different file versions
|
||||
are highlighted in red in columns “A,B & C”. In the output area you need to
|
||||
right click on the highlighted entry and select which change you would like
|
||||
(either A,B or C). <o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>Kdiff3 tries it’s best to automatically choose sensible
|
||||
selections for you (from memory they are always spot on) but for more
|
||||
complicated merging operations user input will be required.<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'><o:p> </o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><b style='mso-bidi-font-weight:normal'><span
|
||||
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;line-height:115%;font-family:
|
||||
"Times New Roman","serif";color:#1F497D;font-style:normal'>Note: When it comes
|
||||
to merging the checksum you can choose any entry as a new one will be generated
|
||||
from the final version of the file (obviously this also applies to the date
|
||||
modified) <o:p></o:p></span></b></p>
|
||||
|
||||
<p class=MsoNormal><b style='mso-bidi-font-weight:normal'><span
|
||||
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;line-height:115%;font-family:
|
||||
"Times New Roman","serif";color:windowtext;font-style:normal'>Here is another
|
||||
screenshot for your reference:<o:p></o:p></span></b></p>
|
||||
|
||||
<p class=MsoNormal><b style='mso-bidi-font-weight:normal'><span
|
||||
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;line-height:115%;font-family:
|
||||
"Times New Roman","serif";color:windowtext;mso-fareast-language:EN-AU;
|
||||
font-style:normal;mso-no-proof:yes'><!--[if gte vml 1]><v:shape id="Picture_x0020_19"
|
||||
o:spid="_x0000_i1026" type="#_x0000_t75" alt="merge4.png" style='width:518.25pt;
|
||||
height:334.5pt;visibility:visible'>
|
||||
<v:imagedata src="Windows_merge_notes_files/image007.png" o:title="merge4"/>
|
||||
</v:shape><![endif]--><![if !vml]><img border=0 width=691 height=446
|
||||
src="Windows_merge_notes_files/image008.jpg" alt=merge4.png v:shapes="Picture_x0020_19"><![endif]></span></b><b
|
||||
style='mso-bidi-font-weight:normal'><span style='font-size:10.0pt;mso-bidi-font-size:
|
||||
11.0pt;line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'><o:p></o:p></span></b></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>Pressing the up and down arrows on the Kdiff3 toolbar will
|
||||
jump you to the next items that requires your attention.<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
mso-fareast-language:EN-AU;font-style:normal;mso-no-proof:yes'><!--[if gte vml 1]><v:shape
|
||||
id="Picture_x0020_21" o:spid="_x0000_i1027" type="#_x0000_t75" alt="toolbar.png"
|
||||
style='width:451.5pt;height:25.5pt;visibility:visible'>
|
||||
<v:imagedata src="Windows_merge_notes_files/image009.png" o:title="toolbar"/>
|
||||
</v:shape><![endif]--><![if !vml]><img border=0 width=602 height=34
|
||||
src="Windows_merge_notes_files/image010.jpg" alt=toolbar.png v:shapes="Picture_x0020_21"><![endif]></span><span
|
||||
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;line-height:115%;font-family:
|
||||
"Times New Roman","serif";color:windowtext;font-style:normal'><o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>After all conflicts have been resolved simply save your changes
|
||||
(if you close the window it will prompt you to save), exit out of Kdiff3 (back
|
||||
to the command prompt) and use <b style='mso-bidi-font-weight:normal'>winscript</b>
|
||||
to push your changes.<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>I usually go with something like <b style='mso-bidi-font-weight:
|
||||
normal'>winscript merge</b> but it’s entirely up to you.<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'><o:p> </o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>If you want to be sure that you have correctly merged all
|
||||
the heads you can use the <b style='mso-bidi-font-weight:normal'>hg heads</b>
|
||||
command.<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>If it comes up with multiple entries (like in the screen
|
||||
shot below you know you have changes that need to be merged.<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
mso-fareast-language:EN-AU;font-style:normal;mso-no-proof:yes'><!--[if gte vml 1]><v:shape
|
||||
id="Picture_x0020_23" o:spid="_x0000_i1028" type="#_x0000_t75" alt="merge6.png"
|
||||
style='width:329.25pt;height:227.25pt;visibility:visible'>
|
||||
<v:imagedata src="Windows_merge_notes_files/image011.png" o:title="merge6"/>
|
||||
</v:shape><![endif]--><![if !vml]><img border=0 width=439 height=303
|
||||
src="Windows_merge_notes_files/image012.gif" alt=merge6.png v:shapes="Picture_x0020_23"><![endif]></span><span
|
||||
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;line-height:115%;font-family:
|
||||
"Times New Roman","serif";color:windowtext;font-style:normal'><o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'><o:p> </o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'>If it looks like the following screen shot everything is ok<o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
mso-fareast-language:EN-AU;font-style:normal;mso-no-proof:yes'><!--[if gte vml 1]><v:shape
|
||||
id="Picture_x0020_24" o:spid="_x0000_i1029" type="#_x0000_t75" alt="merge5.png"
|
||||
style='width:332.25pt;height:224.25pt;visibility:visible'>
|
||||
<v:imagedata src="Windows_merge_notes_files/image013.png" o:title="merge5"/>
|
||||
</v:shape><![endif]--><![if !vml]><img border=0 width=443 height=299
|
||||
src="Windows_merge_notes_files/image014.gif" alt=merge5.png v:shapes="Picture_x0020_24"><![endif]></span><span
|
||||
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;line-height:115%;font-family:
|
||||
"Times New Roman","serif";color:windowtext;font-style:normal'><o:p></o:p></span></p>
|
||||
|
||||
<p class=MsoNormal><span style='font-size:10.0pt;mso-bidi-font-size:11.0pt;
|
||||
line-height:115%;font-family:"Times New Roman","serif";color:windowtext;
|
||||
font-style:normal'><o:p> </o:p></span></p>
|
||||
|
||||
<p class=MsoNormal align=center style='text-align:center'><span
|
||||
style='font-size:10.0pt;mso-bidi-font-size:11.0pt;line-height:115%;font-family:
|
||||
"Times New Roman","serif"'><o:p> </o:p></span></p>
|
||||
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
2
docs/Windows_merge_notes_files/colorschememapping.xml
Normal file
2
docs/Windows_merge_notes_files/colorschememapping.xml
Normal file
@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<a:clrMap xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/>
|
||||
23
docs/Windows_merge_notes_files/filelist.xml
Normal file
23
docs/Windows_merge_notes_files/filelist.xml
Normal file
@ -0,0 +1,23 @@
|
||||
<xml xmlns:o="urn:schemas-microsoft-com:office:office">
|
||||
<o:MainFile HRef="../Windows_merge_notes.htm"/>
|
||||
<o:File HRef="item0001.xml"/>
|
||||
<o:File HRef="props0002.xml"/>
|
||||
<o:File HRef="themedata.thmx"/>
|
||||
<o:File HRef="colorschememapping.xml"/>
|
||||
<o:File HRef="image001.png"/>
|
||||
<o:File HRef="image002.jpg"/>
|
||||
<o:File HRef="image003.png"/>
|
||||
<o:File HRef="image004.gif"/>
|
||||
<o:File HRef="image005.png"/>
|
||||
<o:File HRef="image006.jpg"/>
|
||||
<o:File HRef="image007.png"/>
|
||||
<o:File HRef="image008.jpg"/>
|
||||
<o:File HRef="image009.png"/>
|
||||
<o:File HRef="image010.jpg"/>
|
||||
<o:File HRef="image011.png"/>
|
||||
<o:File HRef="image012.gif"/>
|
||||
<o:File HRef="image013.png"/>
|
||||
<o:File HRef="image014.gif"/>
|
||||
<o:File HRef="header.htm"/>
|
||||
<o:File HRef="filelist.xml"/>
|
||||
</xml>
|
||||
63
docs/Windows_merge_notes_files/header.htm
Normal file
63
docs/Windows_merge_notes_files/header.htm
Normal file
@ -0,0 +1,63 @@
|
||||
<html xmlns:v="urn:schemas-microsoft-com:vml"
|
||||
xmlns:o="urn:schemas-microsoft-com:office:office"
|
||||
xmlns:w="urn:schemas-microsoft-com:office:word"
|
||||
xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
|
||||
xmlns="http://www.w3.org/TR/REC-html40">
|
||||
|
||||
<head>
|
||||
<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
|
||||
<meta name=ProgId content=Word.Document>
|
||||
<meta name=Generator content="Microsoft Word 12">
|
||||
<meta name=Originator content="Microsoft Word 12">
|
||||
<link id=Main-File rel=Main-File href="../Windows_merge_notes.htm">
|
||||
</head>
|
||||
|
||||
<body lang=EN-AU link=blue vlink=purple>
|
||||
|
||||
<div style='mso-element:footnote-separator' id=fs>
|
||||
|
||||
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
|
||||
normal'><span style='mso-special-character:footnote-separator'><![if !supportFootnotes]>
|
||||
|
||||
<hr align=left size=1 width="33%">
|
||||
|
||||
<![endif]></span></p>
|
||||
|
||||
</div>
|
||||
|
||||
<div style='mso-element:footnote-continuation-separator' id=fcs>
|
||||
|
||||
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
|
||||
normal'><span style='mso-special-character:footnote-continuation-separator'><![if !supportFootnotes]>
|
||||
|
||||
<hr align=left size=1>
|
||||
|
||||
<![endif]></span></p>
|
||||
|
||||
</div>
|
||||
|
||||
<div style='mso-element:endnote-separator' id=es>
|
||||
|
||||
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
|
||||
normal'><span style='mso-special-character:footnote-separator'><![if !supportFootnotes]>
|
||||
|
||||
<hr align=left size=1 width="33%">
|
||||
|
||||
<![endif]></span></p>
|
||||
|
||||
</div>
|
||||
|
||||
<div style='mso-element:endnote-continuation-separator' id=ecs>
|
||||
|
||||
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
|
||||
normal'><span style='mso-special-character:footnote-continuation-separator'><![if !supportFootnotes]>
|
||||
|
||||
<hr align=left size=1>
|
||||
|
||||
<![endif]></span></p>
|
||||
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
BIN
docs/Windows_merge_notes_files/image001.png
Normal file
BIN
docs/Windows_merge_notes_files/image001.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 63 KiB |
BIN
docs/Windows_merge_notes_files/image002.jpg
Normal file
BIN
docs/Windows_merge_notes_files/image002.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
BIN
docs/Windows_merge_notes_files/image003.png
Normal file
BIN
docs/Windows_merge_notes_files/image003.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
BIN
docs/Windows_merge_notes_files/image004.gif
Normal file
BIN
docs/Windows_merge_notes_files/image004.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 31 KiB |
BIN
docs/Windows_merge_notes_files/image005.png
Normal file
BIN
docs/Windows_merge_notes_files/image005.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 369 KiB |
BIN
docs/Windows_merge_notes_files/image006.jpg
Normal file
BIN
docs/Windows_merge_notes_files/image006.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 40 KiB |
BIN
docs/Windows_merge_notes_files/image007.png
Normal file
BIN
docs/Windows_merge_notes_files/image007.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 156 KiB |
BIN
docs/Windows_merge_notes_files/image008.jpg
Normal file
BIN
docs/Windows_merge_notes_files/image008.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 55 KiB |
BIN
docs/Windows_merge_notes_files/image009.png
Normal file
BIN
docs/Windows_merge_notes_files/image009.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
BIN
docs/Windows_merge_notes_files/image010.jpg
Normal file
BIN
docs/Windows_merge_notes_files/image010.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.9 KiB |
BIN
docs/Windows_merge_notes_files/image011.png
Normal file
BIN
docs/Windows_merge_notes_files/image011.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 53 KiB |
BIN
docs/Windows_merge_notes_files/image012.gif
Normal file
BIN
docs/Windows_merge_notes_files/image012.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
BIN
docs/Windows_merge_notes_files/image013.png
Normal file
BIN
docs/Windows_merge_notes_files/image013.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 49 KiB |
BIN
docs/Windows_merge_notes_files/image014.gif
Normal file
BIN
docs/Windows_merge_notes_files/image014.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
1
docs/Windows_merge_notes_files/item0001.xml
Normal file
1
docs/Windows_merge_notes_files/item0001.xml
Normal file
@ -0,0 +1 @@
|
||||
<b:Sources SelectedStyle="\APA.XSL" StyleName="APA" xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"></b:Sources>
|
||||
2
docs/Windows_merge_notes_files/props0002.xml
Normal file
2
docs/Windows_merge_notes_files/props0002.xml
Normal file
@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<ds:datastoreItem ds:itemID="{082530C0-8076-4FA2-BE36-EC1CDDE2D1B8}" xmlns:ds="http://schemas.openxmlformats.org/officeDocument/2006/customXml"><ds:schemaRefs><ds:schemaRef ds:uri="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"/></ds:schemaRefs></ds:datastoreItem>
|
||||
BIN
docs/Windows_merge_notes_files/themedata.thmx
Normal file
BIN
docs/Windows_merge_notes_files/themedata.thmx
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user