Age | Commit message (Expand) | Author | Files | Lines |
2020-05-14 | merge-recursive: fix rename/rename(1to2) for working tree with a binary | Elijah Newren | 1 | -0/+55 |
2019-10-23 | t604[236]: do not run setup in separate tests | Elijah Newren | 1 | -44/+67 |
2019-06-05 | merge-recursive: restore accidentally dropped setting of path | Elijah Newren | 1 | -0/+116 |
2019-01-17 | t6042: work around speed optimization on Windows | Johannes Schindelin | 1 | -2/+2 |
2018-11-08 | merge-recursive: improve rename/rename(1to2)/add[/add] handling | Elijah Newren | 1 | -8/+21 |
2018-11-08 | merge-recursive: improve handling for rename/rename(2to1) conflicts | Elijah Newren | 1 | -14/+24 |
2018-11-08 | merge-recursive: fix rename/add conflict handling | Elijah Newren | 1 | -2/+2 |
2018-11-08 | t6036, t6042: testcases for rename collision of already conflicting files | Elijah Newren | 1 | -0/+118 |
2018-11-08 | t6042: add tests for consistency in file collision conflict handling | Elijah Newren | 1 | -0/+162 |
2018-08-17 | Merge branch 'en/abort-df-conflict-fixes' | Junio C Hamano | 1 | -1/+0 |
2018-08-02 | Merge branch 'en/t6042-insane-merge-rename-testcases' | Junio C Hamano | 1 | -0/+245 |
2018-07-31 | read-cache: fix directory/file conflict handling in read_index_unmerged() | Elijah Newren | 1 | -2/+0 |
2018-07-16 | t6000-t6999: fix broken &&-chains | Eric Sunshine | 1 | -4/+4 |
2018-07-03 | t6042: add testcase covering long chains of rename conflicts | Elijah Newren | 1 | -0/+111 |
2018-07-03 | t6042: add testcase covering rename/rename(2to1)/delete/delete conflict | Elijah Newren | 1 | -0/+68 |
2018-07-03 | t6042: add testcase covering rename/add/delete conflict type | Elijah Newren | 1 | -0/+66 |
2018-05-28 | t6036, t6042: prefer test_cmp to sequences of test | Elijah Newren | 1 | -35/+59 |
2018-05-28 | t6036, t6042: prefer test_path_is_file, test_path_is_missing | Elijah Newren | 1 | -20/+20 |
2018-05-28 | t6036, t6042: use test_line_count instead of wc -l | Elijah Newren | 1 | -33/+66 |
2018-05-28 | t6036, t6042: use test_create_repo to keep tests independent | Elijah Newren | 1 | -413/+474 |
2012-07-26 | i18n: merge-recursive: mark strings for translation | Jiang Xin | 1 | -1/+1 |
2012-04-11 | tests: modernise style: more uses of test_line_count | Stefano Lattarini | 1 | -1/+1 |
2011-08-14 | merge-recursive: Fix working copy handling for rename/rename/add/add | Elijah Newren | 1 | -1/+10 |
2011-08-14 | merge-recursive: add handling for rename/rename/add-dest/add-dest | Elijah Newren | 1 | -1/+1 |
2011-08-14 | merge-recursive: Consider modifications in rename/rename(2to1) conflicts | Elijah Newren | 1 | -1/+1 |
2011-08-14 | merge-recursive: Provide more info in conflict markers with file renames | Elijah Newren | 1 | -1/+1 |
2011-08-14 | merge-recursive: Improve handling of rename target vs. directory addition | Elijah Newren | 1 | -1/+1 |
2011-08-14 | merge-recursive: Fix deletion of untracked file in rename/delete conflicts | Elijah Newren | 1 | -1/+1 |
2011-08-14 | t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts | Elijah Newren | 1 | -0/+125 |
2011-08-14 | t6042: Ensure rename/rename conflicts leave index and workdir in sane state | Elijah Newren | 1 | -0/+102 |
2011-08-14 | t6042: Add tests for content issues with modify/rename/directory conflicts | Elijah Newren | 1 | -0/+141 |
2011-08-14 | t6042: Add a testcase where undetected rename causes silent file deletion | Elijah Newren | 1 | -0/+65 |
2011-08-14 | t6042: Add a pair of cases where undetected renames cause issues | Elijah Newren | 1 | -0/+61 |
2011-08-14 | t6042: Add failing testcase for rename/modify/add-source conflict | Elijah Newren | 1 | -0/+39 |
2011-08-14 | t6042: Add a testcase where git deletes an untracked file | Elijah Newren | 1 | -0/+36 |