Edward Thomson 6b54210595 merge: refactor merge tests for empty files treated as renames ...

Don't munge the "trivial" tests, those are specifically about the
"trivial" resolutions for git's tree merge. (For example, adding a file
in a new branch and making no changes in the HEAD branch is something
that can be handled _trivially_.)

For tests of rename functionality, put them in the trees::rename tests.

2024-02-20 13:47:31 +00:00

..

.gitted

merge: refactor merge tests for empty files treated as renames

2024-02-20 13:47:31 +00:00

added-in-master.txt

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

automergeable.txt

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

changed-in-branch.txt

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

changed-in-master.txt

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

conflicting.txt

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

removed-in-branch.txt

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00

unchanged.txt

Rename tests-clar to tests

2013-11-14 14:05:52 -08:00