Demonstrate Word diffing

TomasHubelbauer · Dec 31, 2017 · 3413eac · 3413eac
1 parent 190743c
commit 3413eac
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 15 deletions.
diff --git a/Word.docx b/Word.docx
diff --git a/Word.docx.git/docProps/app.xml b/Word.docx.git/docProps/app.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes">
   <Template>Normal.dotm</Template>
-  <TotalTime>4</TotalTime>
+  <TotalTime>5</TotalTime>
   <Pages>1</Pages>
-  <Words>14</Words>
-  <Characters>85</Characters>
+  <Words>21</Words>
+  <Characters>124</Characters>
   <Application>Microsoft Office Word</Application>
   <DocSecurity>0</DocSecurity>
   <Lines>1</Lines>
@@ -13,7 +13,7 @@
   <Company>
   </Company>
   <LinksUpToDate>false</LinksUpToDate>
-  <CharactersWithSpaces>98</CharactersWithSpaces>
+  <CharactersWithSpaces>144</CharactersWithSpaces>
   <SharedDoc>false</SharedDoc>
   <HyperlinksChanged>false</HyperlinksChanged>
   <AppVersion>16.0000</AppVersion>

diff --git a/Word.docx.git/docProps/app.xml.txt b/Word.docx.git/docProps/app.xml.txt
@@ -1,15 +1,15 @@
 Normal.dotm
-4
+5
 1
-14
-85
+21
+124
 Microsoft Office Word
 0
 1
 1
 false
 false
-98
+144
 false
 false
 16.0000

diff --git a/Word.docx.git/docProps/core.xml b/Word.docx.git/docProps/core.xml
@@ -10,7 +10,7 @@
   <dc:description>
   </dc:description>
   <cp:lastModifiedBy>Tom</cp:lastModifiedBy>
-  <cp:revision>15</cp:revision>
+  <cp:revision>16</cp:revision>
   <dcterms:created xsi:type="dcterms:W3CDTF">2017-12-31T06:50:00Z</dcterms:created>
-  <dcterms:modified xsi:type="dcterms:W3CDTF">2017-12-31T12:18:00Z</dcterms:modified>
+  <dcterms:modified xsi:type="dcterms:W3CDTF">2017-12-31T12:22:00Z</dcterms:modified>
 </cp:coreProperties>
diff --git a/Word.docx.git/docProps/core.xml.txt b/Word.docx.git/docProps/core.xml.txt
@@ -1,6 +1,6 @@
 Tom
 Tom
-15
+16
 2017-12-31T06:50:00Z
-2017-12-31T12:18:00Z
+2017-12-31T12:22:00Z
 
diff --git a/Word.docx.git/word/document.xml b/Word.docx.git/word/document.xml
@@ -14,6 +14,21 @@
         <w:t>This file has been updated to serve as an example of the Word file diffing experience.</w:t>
       </w:r>
     </w:p>
+    <w:p w:rsidR="00250C31" w:rsidRDefault="00250C31" w:rsidP="00A15D7B">
+      <w:pPr>
+        <w:rPr>
+          <w:lang w:val="en-US" />
+        </w:rPr>
+      </w:pPr>
+      <w:r>
+        <w:rPr>
+          <w:lang w:val="en-US" />
+        </w:rPr>
+        <w:t>This text has been added to showcase diffing.</w:t>
+      </w:r>
+      <w:bookmarkStart w:id="0" w:name="_GoBack" />
+      <w:bookmarkEnd w:id="0" />
+    </w:p>
     <w:p w:rsidR="00CA4CAE" w:rsidRDefault="00CA4CAE" w:rsidP="00A15D7B">
       <w:pPr>
         <w:rPr>
@@ -33,8 +48,6 @@
           <w:lang w:val="en-US" />
         </w:rPr>
       </w:pPr>
-      <w:bookmarkStart w:id="0" w:name="_GoBack" />
-      <w:bookmarkEnd w:id="0" />
     </w:p>
     <w:sectPr w:rsidR="00CA4CAE" w:rsidRPr="00A15D7B">
       <w:pgSz w:w="12240" w:h="15840" />

diff --git a/Word.docx.git/word/document.xml.txt b/Word.docx.git/word/document.xml.txt
@@ -1,3 +1,4 @@
 This file has been updated to serve as an example of the Word file diffing experience.
+This text has been added to showcase diffing.
 Thank you!
 
diff --git a/Word.docx.git/word/settings.xml b/Word.docx.git/word/settings.xml
@@ -14,6 +14,7 @@
     <w:rsidRoot w:val="00A15D7B" />
     <w:rsid w:val="00010DFF" />
     <w:rsid w:val="001C6086" />
+    <w:rsid w:val="00250C31" />
     <w:rsid w:val="003F55FD" />
     <w:rsid w:val="004D12F0" />
     <w:rsid w:val="00856154" />
@@ -52,7 +53,7 @@
   </w:shapeDefaults>
   <w:decimalSymbol w:val="." />
   <w:listSeparator w:val="," />
-  <w14:docId w14:val="03A40318" />
+  <w14:docId w14:val="6C2D4945" />
   <w15:chartTrackingRefBased />
   <w15:docId w15:val="{90CCC0EA-AA90-4325-8FB8-A59C568892EB}" />
 </w:settings>