Andrew's git - gitweb.git/history - t/t6042-merge-rename-corner-cases.sh

2011-08-14	merge-recursive: Fix working copy handling for rename...	blob \| diff \| raw
2011-08-14	merge-recursive: add handling for rename/rename/add...	blob \| diff \| raw \| diff to current
2011-08-14	merge-recursive: Consider modifications in rename/renam...	blob \| diff \| raw \| diff to current
2011-08-14	merge-recursive: Provide more info in conflict markers...	blob \| diff \| raw \| diff to current
2011-08-14	merge-recursive: Improve handling of rename target...	blob \| diff \| raw \| diff to current
2011-08-14	merge-recursive: Fix deletion of untracked file in...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Add failing testcases for rename/rename/add...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Ensure rename/rename conflicts leave index and...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Add tests for content issues with modify/rename...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Add a testcase where undetected rename causes...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Add a pair of cases where undetected renames...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Add failing testcase for rename/modify/add-sourc...	blob \| diff \| raw \| diff to current
2011-08-14	t6042: Add a testcase where git deletes an untracked...	blob \| diff \| raw \| diff to current