summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
AgeCommit message (Expand)Author
2020-08-10Collect merge-related tests to t64xxElijah Newren
2020-03-13t6022, t6046: fix flaky files-are-updated checksElijah Newren
2020-02-27t6022, t6046: test expected behavior instead of testing a proxy for itElijah Newren
2020-02-27t6020, t6022, t6035: update merge tests to use test helper functionsElijah Newren
2020-02-27t602[1236], t6034: modernize test formattingElijah Newren
2018-07-30tests: make use of the test_must_be_empty functionÆvar Arnfjörð Bjarmason
2018-05-23Merge branch 'en/rename-directory-detection-reboot'Junio C Hamano
2018-05-08merge-recursive: fix check for skipability of working tree updatesElijah Newren
2018-04-25Merge branch 'ps/test-chmtime-get'Junio C Hamano
2018-04-09t/helper: 'test-chmtime (--get|-g)' to print only the mtimePaul-Sebastian Ungureanu
2018-03-27t/helper: merge test-chmtime into test-toolNguyễn Thái Ngọc Duy
2018-02-08t6022: don't run 'git merge' upstream of a pipeSZEDER Gábor
2015-03-20t: fix trivial &&-chain breakageJeff King
2013-09-04typofix: commit is spelled with two emsJunio C Hamano
2012-07-27i18n: merge-recursive: mark strings for translationJiang Xin
2012-03-23merge-recursive: don't detect renames of empty filesJeff King
2011-08-14merge-recursive: Avoid unnecessary file rewritesElijah Newren
2011-08-14t6022: Additional tests checking for unnecessary updates of filesElijah Newren
2011-08-14merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren
2011-08-14t6022: Add testcase for spurious "refusing to lose untracked" messagesElijah Newren
2011-08-14merge-recursive: Make modify/delete handling code reusableElijah Newren
2011-08-14merge-recursive: When we detect we can skip an update, actually skip itElijah Newren
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesElijah Newren
2011-08-14merge-recursive: Improve handling of rename target vs. directory additionElijah Newren
2011-08-14t6022: Add testcase for merging a renamed file with a simple changeElijah Newren
2011-08-14t6022: New tests checking for unnecessary updates of filesElijah Newren
2011-08-14t6022: Remove unnecessary untracked files to make test cleanerElijah Newren
2010-11-30Merge branch 'en/merge-recursive'Junio C Hamano
2010-11-17t6022: Use -eq not = to test output of wc -lBrian Gernhardt
2010-11-09t6022 (renaming merge): chain test commands with &&Jonathan Nieder
2010-09-30merge_content(): Check whether D/F conflicts are still presentElijah Newren
2010-09-30conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren
2010-09-30conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren
2010-09-30merge-recursive: Delay content merging for renamesElijah Newren
2010-09-30merge-recursive: Move handling of double rename of one file to twoElijah Newren
2010-09-30t6022: Add tests for rename/rename combined with D/F conflictsElijah Newren
2010-09-30t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Elijah Newren
2010-09-30t6022: Add tests with both rename source & dest involved in D/F conflictsElijah Newren
2010-09-30t6022: Add tests for reversing order of merges when D/F conflicts presentElijah Newren
2010-09-30t6022: Add test combinations of {content conflict?, D/F conflict remains?}Elijah Newren
2010-05-31tests: use "test_cmp", not "diff", when verifying the resultGary V. Vaughan
2007-04-26Add a test for merging changed and rename-changed branchesAlex Riesen
2006-10-28t6022: ignoring untracked files by merge-recursive when they do not matterJunio C Hamano
2006-10-27tests: merge-recursive is usable without PythonJunio C Hamano
2006-05-17read-tree -m -u: do not overwrite or remove untracked working tree files.Junio C Hamano
2006-02-19Optionally work without pythonJohannes Schindelin
2005-12-22merge-recursive: conflicting rename case.Junio C Hamano
2005-12-11t/t6022: a new test for renaming merge.Junio C Hamano