aboutsummaryrefslogtreecommitdiff
path: root/t/t6042-merge-rename-corner-cases.sh
Commit message (Expand)AuthorAge
* i18n: merge-recursive: mark strings for translationJiang Xin2012-07-26
* tests: modernise style: more uses of test_line_countStefano Lattarini2012-04-11
* merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren2011-08-14
* merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren2011-08-14
* merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren2011-08-14
* merge-recursive: Provide more info in conflict markers with file renamesElijah Newren2011-08-14
* merge-recursive: Improve handling of rename target vs. directory additionElijah Newren2011-08-14
* merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren2011-08-14
* t6042: Add failing testcases for rename/rename/add-{source,dest} conflictsElijah Newren2011-08-14
* t6042: Ensure rename/rename conflicts leave index and workdir in sane stateElijah Newren2011-08-14
* t6042: Add tests for content issues with modify/rename/directory conflictsElijah Newren2011-08-14
* t6042: Add a testcase where undetected rename causes silent file deletionElijah Newren2011-08-14
* t6042: Add a pair of cases where undetected renames cause issuesElijah Newren2011-08-14
* t6042: Add failing testcase for rename/modify/add-source conflictElijah Newren2011-08-14
* t6042: Add a testcase where git deletes an untracked fileElijah Newren2011-08-14
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-18 12:10:26 +0000