summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
AgeCommit message (Expand)AuthorFilesLines
2010-09-29t6022: Add tests for rename/rename combined with D/F conflictsLibravatar Elijah Newren1-0/+79
2010-09-29t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Libravatar Elijah Newren1-0/+63
2010-09-29t6022: Add tests with both rename source & dest involved in D/F conflictsLibravatar Elijah Newren1-0/+38
2010-09-29t6022: Add tests for reversing order of merges when D/F conflicts presentLibravatar Elijah Newren1-0/+58
2010-09-29t6022: Add test combinations of {content conflict?, D/F conflict remains?}Libravatar Elijah Newren1-0/+128
2010-05-31tests: use "test_cmp", not "diff", when verifying the resultLibravatar Gary V. Vaughan1-2/+2
2007-04-25Add a test for merging changed and rename-changed branchesLibravatar Alex Riesen1-0/+23
2006-10-27t6022: ignoring untracked files by merge-recursive when they do not matterLibravatar Junio C Hamano1-23/+142
2006-10-27tests: merge-recursive is usable without PythonLibravatar Junio C Hamano1-6/+0
2006-05-17read-tree -m -u: do not overwrite or remove untracked working tree files.Libravatar Junio C Hamano1-0/+1
2006-02-18Optionally work without pythonLibravatar Johannes Schindelin1-0/+6
2005-12-21merge-recursive: conflicting rename case.Libravatar Junio C Hamano1-0/+37
2005-12-11t/t6022: a new test for renaming merge.Libravatar Junio C Hamano1-0/+164
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 05:28:56 +0000