From bd9e6617827818fd043452c08c606f07b78014a0 Mon Sep 17 00:00:00 2001 From: toma Date: Wed, 25 Nov 2009 17:56:58 +0000 Subject: Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features. BUG:215923 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kompare/tests/diff/context.diff | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 kompare/tests/diff/context.diff (limited to 'kompare/tests/diff/context.diff') diff --git a/kompare/tests/diff/context.diff b/kompare/tests/diff/context.diff new file mode 100644 index 00000000..e17df000 --- /dev/null +++ b/kompare/tests/diff/context.diff @@ -0,0 +1,27 @@ +*** /home/John/lao Thu Apr 12 11:09:30 2001 +--- /home/John/tzu Sat Jul 28 13:23:25 2001 +*************** +*** 1,7 **** +- The Way that can be told of is not the eternal Way; +- The name that can be named is not the eternal name. + The Nameless is the origin of Heaven and Earth; +! The Named is the mother of all things. + Therefore let there always be non-being, + so we may see their subtlety, + And let there always be being, +--- 1,6 ---- + The Nameless is the origin of Heaven and Earth; +! The named is the mother of all things. +! + Therefore let there always be non-being, + so we may see their subtlety, + And let there always be being, +*************** +*** 9,11 **** +--- 8,13 ---- + The two are the same, + But after they are produced, + they have different names. ++ They both may be called deep and profound. ++ Deeper and more profound, ++ The door of all subtleties! -- cgit v1.2.3