aboutsummaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
Commit message (Expand)AuthorAge
* Revert "Merge branch 'en/merge-recursive'"Junio C Hamano2011-05-19
* Merge branch 'en/merge-recursive'Junio C Hamano2011-04-28
|\
| * merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-03-02
| * t6022: New test checking for unnecessary updates of files in D/F conflictsElijah Newren2011-03-02
| * t6022: New test checking for unnecessary updates of renamed+modified filesElijah Newren2011-03-02
* | Merge branch 'en/merge-recursive'Junio C Hamano2010-11-29
|\ \ | |/
| * t6022: Use -eq not = to test output of wc -lBrian Gernhardt2010-11-17
| * merge_content(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
| * conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren2010-09-29
| * conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
| * merge-recursive: Delay content merging for renamesElijah Newren2010-09-29
| * merge-recursive: Move handling of double rename of one file to twoElijah Newren2010-09-29
| * t6022: Add tests for rename/rename combined with D/F conflictsElijah Newren2010-09-29
| * t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Elijah Newren2010-09-29
| * t6022: Add tests with both rename source & dest involved in D/F conflictsElijah Newren2010-09-29
| * t6022: Add tests for reversing order of merges when D/F conflicts presentElijah Newren2010-09-29
| * t6022: Add test combinations of {content conflict?, D/F conflict remains?}Elijah Newren2010-09-29
* | t6022 (renaming merge): chain test commands with &&Jonathan Nieder2010-11-09
|/
* tests: use "test_cmp", not "diff", when verifying the resultGary V. Vaughan2010-05-31
* Add a test for merging changed and rename-changed branchesAlex Riesen2007-04-25
* t6022: ignoring untracked files by merge-recursive when they do not matterJunio C Hamano2006-10-27
* tests: merge-recursive is usable without PythonJunio C Hamano2006-10-27
* read-tree -m -u: do not overwrite or remove untracked working tree files.Junio C Hamano2006-05-17
* Optionally work without pythonJohannes Schindelin2006-02-18
* merge-recursive: conflicting rename case.Junio C Hamano2005-12-21
* t/t6022: a new test for renaming merge.Junio C Hamano2005-12-11