summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
Commit message (Expand)AuthorAgeFilesLines
* i18n: merge-recursive: mark strings for translationJiang Xin2012-07-261-8/+8
* merge-recursive: don't detect renames of empty filesjk/diff-no-rename-emptyJeff King2012-03-231-0/+16
* merge-recursive: Avoid unnecessary file rewritesElijah Newren2011-08-141-3/+3
* t6022: Additional tests checking for unnecessary updates of filesElijah Newren2011-08-141-0/+91
* merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren2011-08-141-1/+1
* t6022: Add testcase for spurious "refusing to lose untracked" messagesElijah Newren2011-08-141-0/+26
* merge-recursive: Make modify/delete handling code reusableElijah Newren2011-08-141-2/+2
* merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-08-141-2/+2
* merge-recursive: Provide more info in conflict markers with file renamesElijah Newren2011-08-141-4/+71
* merge-recursive: Improve handling of rename target vs. directory additionElijah Newren2011-08-141-2/+2
* t6022: Add testcase for merging a renamed file with a simple changeElijah Newren2011-08-141-0/+27
* t6022: New tests checking for unnecessary updates of filesElijah Newren2011-08-141-0/+63
* t6022: Remove unnecessary untracked files to make test cleanerElijah Newren2011-08-141-0/+1
* Merge branch 'en/merge-recursive'Junio C Hamano2010-11-291-0/+366
|\
| * t6022: Use -eq not = to test output of wc -lBrian Gernhardt2010-11-171-32/+32
| * merge_content(): Check whether D/F conflicts are still presentElijah Newren2010-09-291-4/+4
| * conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren2010-09-291-1/+1
| * conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren2010-09-291-2/+2
| * merge-recursive: Delay content merging for renamesElijah Newren2010-09-291-1/+1
| * merge-recursive: Move handling of double rename of one file to twoElijah Newren2010-09-291-1/+1
| * t6022: Add tests for rename/rename combined with D/F conflictsElijah Newren2010-09-291-0/+79
| * t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Elijah Newren2010-09-291-0/+63
| * t6022: Add tests with both rename source & dest involved in D/F conflictsElijah Newren2010-09-291-0/+38
| * t6022: Add tests for reversing order of merges when D/F conflicts presentElijah Newren2010-09-291-0/+58
| * t6022: Add test combinations of {content conflict?, D/F conflict remains?}Elijah Newren2010-09-291-0/+128
* | t6022 (renaming merge): chain test commands with &&Jonathan Nieder2010-11-091-190/+92
|/
* tests: use "test_cmp", not "diff", when verifying the resultGary V. Vaughan2010-05-311-2/+2
* Add a test for merging changed and rename-changed branchesAlex Riesen2007-04-251-0/+23
* t6022: ignoring untracked files by merge-recursive when they do not matterJunio C Hamano2006-10-271-23/+142
* tests: merge-recursive is usable without PythonJunio C Hamano2006-10-271-6/+0
* read-tree -m -u: do not overwrite or remove untracked working tree files.Junio C Hamano2006-05-171-0/+1
* Optionally work without pythonJohannes Schindelin2006-02-181-0/+6
* merge-recursive: conflicting rename case.Junio C Hamano2005-12-211-0/+37
* t/t6022: a new test for renaming merge.Junio C Hamano2005-12-111-0/+164
View Lorry Controller Status