Age | Commit message (Expand) | Author |
2020-08-11 | Collect merge-related tests to t64xx | Elijah Newren |
2020-03-13 | t6022, t6046: fix flaky files-are-updated checks | Elijah Newren |
2020-02-27 | t6022, t6046: test expected behavior instead of testing a proxy for it | Elijah Newren |
2020-02-27 | t6020, t6022, t6035: update merge tests to use test helper functions | Elijah Newren |
2020-02-27 | t602[1236], t6034: modernize test formatting | Elijah Newren |
2018-07-30 | tests: make use of the test_must_be_empty function | Ævar Arnfjörð Bjarmason |
2018-05-23 | Merge branch 'en/rename-directory-detection-reboot' | Junio C Hamano |
2018-05-08 | merge-recursive: fix check for skipability of working tree updates | Elijah Newren |
2018-04-25 | Merge branch 'ps/test-chmtime-get' | Junio C Hamano |
2018-04-09 | t/helper: 'test-chmtime (--get|-g)' to print only the mtime | Paul-Sebastian Ungureanu |
2018-03-27 | t/helper: merge test-chmtime into test-tool | Nguyễn Thái Ngọc Duy |
2018-02-08 | t6022: don't run 'git merge' upstream of a pipe | SZEDER Gábor |
2015-03-20 | t: fix trivial &&-chain breakage | Jeff King |
2013-09-05 | typofix: commit is spelled with two ems | Junio C Hamano |
2012-07-27 | i18n: merge-recursive: mark strings for translation | Jiang Xin |
2012-03-24 | merge-recursive: don't detect renames of empty files | Jeff King |
2011-08-15 | merge-recursive: Avoid unnecessary file rewrites | Elijah Newren |
2011-08-15 | t6022: Additional tests checking for unnecessary updates of files | Elijah Newren |
2011-08-15 | merge-recursive: Fix spurious 'refusing to lose untracked file...' messages | Elijah Newren |
2011-08-15 | t6022: Add testcase for spurious "refusing to lose untracked" messages | Elijah Newren |
2011-08-15 | merge-recursive: Make modify/delete handling code reusable | Elijah Newren |
2011-08-15 | merge-recursive: When we detect we can skip an update, actually skip it | Elijah Newren |
2011-08-15 | merge-recursive: Provide more info in conflict markers with file renames | Elijah Newren |
2011-08-15 | merge-recursive: Improve handling of rename target vs. directory addition | Elijah Newren |
2011-08-15 | t6022: Add testcase for merging a renamed file with a simple change | Elijah Newren |
2011-08-15 | t6022: New tests checking for unnecessary updates of files | Elijah Newren |
2011-08-15 | t6022: Remove unnecessary untracked files to make test cleaner | Elijah Newren |
2010-11-30 | Merge branch 'en/merge-recursive' | Junio C Hamano |
2010-11-18 | t6022: Use -eq not = to test output of wc -l | Brian Gernhardt |
2010-11-10 | t6022 (renaming merge): chain test commands with && | Jonathan Nieder |
2010-09-30 | merge_content(): Check whether D/F conflicts are still present | Elijah Newren |
2010-09-30 | conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts | Elijah Newren |
2010-09-30 | conflict_rename_delete(): Check whether D/F conflicts are still present | Elijah Newren |
2010-09-30 | merge-recursive: Delay content merging for renames | Elijah Newren |
2010-09-30 | merge-recursive: Move handling of double rename of one file to two | Elijah Newren |
2010-09-30 | t6022: Add tests for rename/rename combined with D/F conflicts | Elijah Newren |
2010-09-30 | t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two) | Elijah Newren |
2010-09-30 | t6022: Add tests with both rename source & dest involved in D/F conflicts | Elijah Newren |
2010-09-30 | t6022: Add tests for reversing order of merges when D/F conflicts present | Elijah Newren |
2010-09-30 | t6022: Add test combinations of {content conflict?, D/F conflict remains?} | Elijah Newren |
2010-06-01 | tests: use "test_cmp", not "diff", when verifying the result | Gary V. Vaughan |
2007-04-26 | Add a test for merging changed and rename-changed branches | Alex Riesen |
2006-10-28 | t6022: ignoring untracked files by merge-recursive when they do not matter | Junio C Hamano |
2006-10-28 | tests: merge-recursive is usable without Python | Junio C Hamano |
2006-05-17 | read-tree -m -u: do not overwrite or remove untracked working tree files. | Junio C Hamano |
2006-02-19 | Optionally work without python | Johannes Schindelin |
2005-12-22 | merge-recursive: conflicting rename case. | Junio C Hamano |
2005-12-11 | t/t6022: a new test for renaming merge. | Junio C Hamano |