From 3413eacaaeb236a06033a443d7979f19207a613b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20H=C3=BCbelbauer?= Date: Sun, 31 Dec 2017 13:22:34 +0100 Subject: [PATCH] Demonstrate Word diffing --- Word.docx | Bin 12233 -> 12286 bytes Word.docx.git/docProps/app.xml | 8 ++++---- Word.docx.git/docProps/app.xml.txt | 8 ++++---- Word.docx.git/docProps/core.xml | 4 ++-- Word.docx.git/docProps/core.xml.txt | 4 ++-- Word.docx.git/word/document.xml | 17 +++++++++++++++-- Word.docx.git/word/document.xml.txt | 1 + Word.docx.git/word/settings.xml | 3 ++- 8 files changed, 30 insertions(+), 15 deletions(-) diff --git a/Word.docx b/Word.docx index e208b9ed91669ad46ec0f2d81796354cffa2f301..0cf042f0e6a235ed52c358f88472c786b305a456 100644 GIT binary patch delta 2855 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 diff --git a/Word.docx.git/docProps/app.xml b/Word.docx.git/docProps/app.xml index 5c60ae3..4fb6a58 100644 --- a/Word.docx.git/docProps/app.xml +++ b/Word.docx.git/docProps/app.xml @@ -1,10 +1,10 @@  - 4 + 5 1 - 14 - 85 + 21 + 124 Microsoft Office Word 0 1 @@ -13,7 +13,7 @@ false - 98 + 144 false false 16.0000 diff --git a/Word.docx.git/docProps/app.xml.txt b/Word.docx.git/docProps/app.xml.txt index 0b2aed7..6bf2291 100644 --- 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 index 002c3cd..ec38ec9 100644 --- a/Word.docx.git/docProps/core.xml +++ b/Word.docx.git/docProps/core.xml @@ -10,7 +10,7 @@ Tom - 15 + 16 2017-12-31T06:50:00Z - 2017-12-31T12:18:00Z + 2017-12-31T12:22:00Z \ No newline at end of file diff --git a/Word.docx.git/docProps/core.xml.txt b/Word.docx.git/docProps/core.xml.txt index 376aec4..f7e346e 100644 --- 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 index a4d19c7..6a6cf44 100644 --- a/Word.docx.git/word/document.xml +++ b/Word.docx.git/word/document.xml @@ -14,6 +14,21 @@ This file has been updated to serve as an example of the Word file diffing experience. + + + + + + + + + + + This text has been added to showcase diffing. + + + + @@ -33,8 +48,6 @@ - - diff --git a/Word.docx.git/word/document.xml.txt b/Word.docx.git/word/document.xml.txt index 1c18c9b..78e4107 100644 --- 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 index 76a9346..41fb179 100644 --- a/Word.docx.git/word/settings.xml +++ b/Word.docx.git/word/settings.xml @@ -14,6 +14,7 @@ + @@ -52,7 +53,7 @@ - + \ No newline at end of file