Collect merge-related tests to t64xx

The tests for the merge machinery are spread over several places.
Collect them into t64xx for simplicity.  Some notes:

t60[234]*.sh:
  Merge tests started in t602*, overgrew bisect and remote tracking
  tests in t6030, t6040, and t6041, and nearly overtook replace tests
  in t6050.  This made picking out relevant tests that I wanted to run
  in a tighter loop slightly more annoying for years.

t303*.sh:
  These started out as tests for the 'merge-recursive' toplevel command,
  but did not restrict to that and had lots of overlap with the
  underlying merge machinery.
t7405, t7613:
  submodule-specific merge logic started out in submodule.c but was
  moved to merge-recursive.c in commit 18cfc08866 ("submodule.c: move
  submodule merging to merge-recursive.c", 2018-05-15).  Since these
  tests are about the logic found in the merge machinery, moving these
  tests to be with the merge tests makes sense.

t7607, t7609:
  Having tests spread all over the place makes it more likely that
  additional tests related to a certain piece of logic grow in all those
  other places.  Much like t303*.sh, these two tests were about the
  underlying merge machinery rather than outer levels.

Tests that were NOT moved:

t76[01]*.sh:
  Other than the four tests mentioned above, the remaining tests in
  t76[01]*.sh are related to non-recursive merge strategies, parameter
  parsing, and other stuff associated with the highlevel builtin/merge.c
  rather than the recursive merge machinery.

t3[45]*.sh:
  The rebase testcases in t34*.sh also test the merge logic pretty
  heavily; sometimes changes I make only trigger failures in the rebase
  tests.  The rebase tests are already nicely coupled together, though,
  and I didn't want to mess that up.  Similar comments apply for the
  cherry-pick tests in t35*.sh.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

1 files changed, 0 insertions, 138 deletions

diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh
deleted file mode 100755
index 5c8894d94f..0000000000
--- a/t/t7609-merge-co-error-msgs.sh
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/sh
-
-test_description='unpack-trees error messages'
-
-. ./test-lib.sh
-
-
-test_expect_success 'setup' '
-	echo one >one &&
-	git add one &&
-	git commit -a -m First &&
-
-	git checkout -b branch &&
-	echo two >two &&
-	echo three >three &&
-	echo four >four &&
-	echo five >five &&
-	git add two three four five &&
-	git commit -m Second &&
-
-	git checkout master &&
-	echo other >two &&
-	echo other >three &&
-	echo other >four &&
-	echo other >five
-'
-
-cat >expect <<\EOF
-error: The following untracked working tree files would be overwritten by merge:
-	five
-	four
-	three
-	two
-Please move or remove them before you merge.
-Aborting
-EOF
-
-test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' '
-	test_must_fail git merge branch 2>out &&
-	test_i18ncmp out expect &&
-	git commit --allow-empty -m empty &&
-	(
-		GIT_MERGE_VERBOSITY=0 &&
-		export GIT_MERGE_VERBOSITY &&
-		test_must_fail git merge branch 2>out2
-	) &&
-	test_i18ncmp out2 expect &&
-	git reset --hard HEAD^
-'
-
-cat >expect <<\EOF
-error: Your local changes to the following files would be overwritten by merge:
-	four
-	three
-	two
-Please commit your changes or stash them before you merge.
-error: The following untracked working tree files would be overwritten by merge:
-	five
-Please move or remove them before you merge.
-Aborting
-EOF
-
-test_expect_success 'untracked files or local changes ovewritten by merge' '
-	git add two &&
-	git add three &&
-	git add four &&
-	test_must_fail git merge branch 2>out &&
-	test_i18ncmp out expect
-'
-
-cat >expect <<\EOF
-error: Your local changes to the following files would be overwritten by checkout:
-	rep/one
-	rep/two
-Please commit your changes or stash them before you switch branches.
-Aborting
-EOF
-
-test_expect_success 'cannot switch branches because of local changes' '
-	git add five &&
-	mkdir rep &&
-	echo one >rep/one &&
-	echo two >rep/two &&
-	git add rep/one rep/two &&
-	git commit -m Fourth &&
-	git checkout master &&
-	echo uno >rep/one &&
-	echo dos >rep/two &&
-	test_must_fail git checkout branch 2>out &&
-	test_i18ncmp out expect
-'
-
-cat >expect <<\EOF
-error: Your local changes to the following files would be overwritten by checkout:
-	rep/one
-	rep/two
-Please commit your changes or stash them before you switch branches.
-Aborting
-EOF
-
-test_expect_success 'not uptodate file porcelain checkout error' '
-	git add rep/one rep/two &&
-	test_must_fail git checkout branch 2>out &&
-	test_i18ncmp out expect
-'
-
-cat >expect <<\EOF
-error: Updating the following directories would lose untracked files in them:
-	rep
-	rep2
-
-Aborting
-EOF
-
-test_expect_success 'not_uptodate_dir porcelain checkout error' '
-	git init uptodate &&
-	cd uptodate &&
-	mkdir rep &&
-	mkdir rep2 &&
-	touch rep/foo &&
-	touch rep2/foo &&
-	git add rep/foo rep2/foo &&
-	git commit -m init &&
-	git checkout -b branch &&
-	git rm rep -r &&
-	git rm rep2 -r &&
-	>rep &&
-	>rep2 &&
-	git add rep rep2 &&
-	git commit -m "added test as a file" &&
-	git checkout master &&
-	>rep/untracked-file &&
-	>rep2/untracked-file &&
-	test_must_fail git checkout branch 2>out &&
-	test_i18ncmp out ../expect
-'
-
-test_done