summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
AgeCommit message (Expand)AuthorFilesLines
2018-03-27t/helper: merge test-chmtime into test-toolLibravatar Nguyễn Thái Ngọc Duy1-15/+15
2018-02-08t6022: don't run 'git merge' upstream of a pipeLibravatar SZEDER Gábor1-2/+4
2015-03-20t: fix trivial &&-chain breakageLibravatar Jeff King1-3/+3
2013-09-04typofix: commit is spelled with two emsLibravatar Junio C Hamano1-7/+7
2012-07-26i18n: merge-recursive: mark strings for translationLibravatar Jiang Xin1-8/+8
2012-03-23merge-recursive: don't detect renames of empty filesLibravatar Jeff King1-0/+16
2011-08-14merge-recursive: Avoid unnecessary file rewritesLibravatar Elijah Newren1-3/+3
2011-08-14t6022: Additional tests checking for unnecessary updates of filesLibravatar Elijah Newren1-0/+91
2011-08-14merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesLibravatar Elijah Newren1-1/+1
2011-08-14t6022: Add testcase for spurious "refusing to lose untracked" messagesLibravatar Elijah Newren1-0/+26
2011-08-14merge-recursive: Make modify/delete handling code reusableLibravatar Elijah Newren1-2/+2
2011-08-14merge-recursive: When we detect we can skip an update, actually skip itLibravatar Elijah Newren1-2/+2
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesLibravatar Elijah Newren1-4/+71
2011-08-14merge-recursive: Improve handling of rename target vs. directory additionLibravatar Elijah Newren1-2/+2
2011-08-14t6022: Add testcase for merging a renamed file with a simple changeLibravatar Elijah Newren1-0/+27
2011-08-14t6022: New tests checking for unnecessary updates of filesLibravatar Elijah Newren1-0/+63
2011-08-14t6022: Remove unnecessary untracked files to make test cleanerLibravatar Elijah Newren1-0/+1
2010-11-29Merge branch 'en/merge-recursive'Libravatar Junio C Hamano1-0/+366
2010-11-17t6022: Use -eq not = to test output of wc -lLibravatar Brian Gernhardt1-32/+32
2010-11-09t6022 (renaming merge): chain test commands with &&Libravatar Jonathan Nieder1-190/+92
2010-09-29merge_content(): Check whether D/F conflicts are still presentLibravatar Elijah Newren1-4/+4
2010-09-29conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsLibravatar Elijah Newren1-1/+1
2010-09-29conflict_rename_delete(): Check whether D/F conflicts are still presentLibravatar Elijah Newren1-2/+2
2010-09-29merge-recursive: Delay content merging for renamesLibravatar Elijah Newren1-1/+1
2010-09-29merge-recursive: Move handling of double rename of one file to twoLibravatar Elijah Newren1-1/+1
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-11-12 15:06:03 +0000