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 --- cervisia/tests/resolvedlg-BR74903-test-01.txt | 4 ++++ cervisia/tests/resolvedlg-conflict-test-01.txt | 5 +++++ cervisia/tests/resolvedlg-conflict-test-02.txt | 9 +++++++++ 3 files changed, 18 insertions(+) create mode 100644 cervisia/tests/resolvedlg-BR74903-test-01.txt create mode 100644 cervisia/tests/resolvedlg-conflict-test-01.txt create mode 100644 cervisia/tests/resolvedlg-conflict-test-02.txt (limited to 'cervisia/tests') diff --git a/cervisia/tests/resolvedlg-BR74903-test-01.txt b/cervisia/tests/resolvedlg-BR74903-test-01.txt new file mode 100644 index 00000000..c4b8a22f --- /dev/null +++ b/cervisia/tests/resolvedlg-BR74903-test-01.txt @@ -0,0 +1,4 @@ +123 +<<<<<<< resolvedlg-BR74903-test-01.txt +conf======= +456>>>>>>> 1.2 diff --git a/cervisia/tests/resolvedlg-conflict-test-01.txt b/cervisia/tests/resolvedlg-conflict-test-01.txt new file mode 100644 index 00000000..bbcd08c3 --- /dev/null +++ b/cervisia/tests/resolvedlg-conflict-test-01.txt @@ -0,0 +1,5 @@ +<<<<<<< resolvedlg-conflict-test-01.txt +Line 1 - modified on CONFLICT_BRANCH +======= +Line 1 - modified on HEAD +>>>>>>> 1.2 diff --git a/cervisia/tests/resolvedlg-conflict-test-02.txt b/cervisia/tests/resolvedlg-conflict-test-02.txt new file mode 100644 index 00000000..5d72025e --- /dev/null +++ b/cervisia/tests/resolvedlg-conflict-test-02.txt @@ -0,0 +1,9 @@ +Line 1 +Line 2 +<<<<<<< resolvedlg-conflict-test-02.txt +Line 3 - modified on CONFLICT_BRANCH +======= +Line 3 - modified on HEAD +>>>>>>> 1.2 +Line 4 +Line 5 -- cgit v1.2.1