diff options
| author | toma <toma@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-11-25 17:56:58 +0000 |
|---|---|---|
| committer | toma <toma@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-11-25 17:56:58 +0000 |
| commit | bd9e6617827818fd043452c08c606f07b78014a0 (patch) | |
| tree | 425bb4c3168f9c02f10150f235d2cb998dcc6108 /kompare/tests/perforce/unifiedm.diff | |
| download | tdesdk-bd9e6617827818fd043452c08c606f07b78014a0.tar.gz tdesdk-bd9e6617827818fd043452c08c606f07b78014a0.zip | |
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
Diffstat (limited to 'kompare/tests/perforce/unifiedm.diff')
| -rw-r--r-- | kompare/tests/perforce/unifiedm.diff | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/kompare/tests/perforce/unifiedm.diff b/kompare/tests/perforce/unifiedm.diff new file mode 100644 index 00000000..6aa832e7 --- /dev/null +++ b/kompare/tests/perforce/unifiedm.diff @@ -0,0 +1,19 @@ +==== //depot/craphola#1 - /home/bruggie/perforce-repo/craphola ==== +@@ -2,3 +2,10 @@ + I'm just adding this file to see what it does with multiple file that have differences + + Now i'll add some text more later in the #2 revision but that has to wait a bit ++ ++This will be a copy and paste of the previous lines just to have some changes for revision 2 of this file ++ ++This is another t4extfile used to test the perforce diff stuff ++I'm just adding this file to see what it does with multiple file that have differences ++ ++Now i'll add some text more later in the #2 revision but that has to wait a bit +==== //depot/testje#2 - /home/bruggie/perforce-repo/testje ==== +@@ -3,3 +3,5 @@ + + but i + 'll see what this is all about later on ++ ++More lines for #3 to see what happens in a multifile diff |