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