Add Testing/Data/Conflict

diff --git a/Testing/Data/Conflict/make_git_conflict.cmd b/Testing/Data/Conflict/make_git_conflict.cmd
new file mode 100644 (file)
index 0000000..9bfa197
--- /dev/null
+++ b/Testing/Data/Conflict/make_git_conflict.cmd
@@ -0,0 +1,19 @@
+rmdir /s/q gittest 2> NUL
+mkdir gittest
+pushd gittest
+git init
+echo aaaa > test.txt
+git add test.txt
+git commit -m "commit1"
+git branch testbranch
+git switch testbranch
+echo bbbb >> test.txt
+git add test.txt
+git commit -m "commit2"
+git switch master
+echo cccc >> test.txt
+git add test.txt
+git commit -m "commit3"
+git merge testbranch
+popd
+

diff --git a/Testing/Data/Conflict/make_hg_conflict.cmd b/Testing/Data/Conflict/make_hg_conflict.cmd
new file mode 100644 (file)
index 0000000..33a335d
--- /dev/null
+++ b/Testing/Data/Conflict/make_hg_conflict.cmd
@@ -0,0 +1,16 @@
+rmdir /s/q hgtest 2> NUL
+mkdir hgtest
+pushd hgtest
+hg init
+echo aaaa > test.txt
+hg add test.txt
+hg commit -m "commit1"
+hg branch testbranch
+echo bbbb >> test.txt
+hg commit -m "commit2"
+hg update default
+echo cccc >> test.txt
+hg commit -m "commit3"
+hg merge testbranch
+popd
+

diff --git a/Testing/Data/Conflict/make_svn_conflict.cmd b/Testing/Data/Conflict/make_svn_conflict.cmd
new file mode 100644 (file)
index 0000000..010da6c
--- /dev/null
+++ b/Testing/Data/Conflict/make_svn_conflict.cmd
@@ -0,0 +1,27 @@
+rmdir /s/q svnrepo 2> NUL
+rmdir /s/q svntest 2> NUL
+mkdir svnrepo
+pushd svnrepo
+svnadmin create svntest
+popd
+svn checkout file:///%~dp0svnrepo/svntest
+pushd svntest
+svn mkdir trunk
+svn mkdir branches
+svn mkdir tags
+svn commit -m "commit0"
+echo aaaa > trunk/test.txt
+svn add trunk/test.txt
+svn commit -m "commit1" 
+svn copy trunk branches/testbranch
+svn commit -m "commit2"
+echo bbbb >> branches/testbranch/test.txt
+svn commit -m "commit3" 
+echo cccc >> trunk/test.txt
+svn commit -m "commit4"
+svn update 
+pushd trunk
+svn merge ../branches/testbranch
+popd
+popd
+