delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	i18n: merge-recursive: mark strings for translation	Jiang Xin	2012-07-26	1	-1/+1
*	tests: modernise style: more uses of test_line_count	Stefano Lattarini	2012-04-11	1	-1/+1
*	merge-recursive: Fix working copy handling for rename/rename/add/add	Elijah Newren	2011-08-14	1	-1/+10
*	merge-recursive: add handling for rename/rename/add-dest/add-dest	Elijah Newren	2011-08-14	1	-1/+1
*	merge-recursive: Consider modifications in rename/rename(2to1) conflicts	Elijah Newren	2011-08-14	1	-1/+1
*	merge-recursive: Provide more info in conflict markers with file renames	Elijah Newren	2011-08-14	1	-1/+1
*	merge-recursive: Improve handling of rename target vs. directory addition	Elijah Newren	2011-08-14	1	-1/+1
*	merge-recursive: Fix deletion of untracked file in rename/delete conflicts	Elijah Newren	2011-08-14	1	-1/+1
*	t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts	Elijah Newren	2011-08-14	1	-0/+125
*	t6042: Ensure rename/rename conflicts leave index and workdir in sane state	Elijah Newren	2011-08-14	1	-0/+102
*	t6042: Add tests for content issues with modify/rename/directory conflicts	Elijah Newren	2011-08-14	1	-0/+141
*	t6042: Add a testcase where undetected rename causes silent file deletion	Elijah Newren	2011-08-14	1	-0/+65
*	t6042: Add a pair of cases where undetected renames cause issues	Elijah Newren	2011-08-14	1	-0/+61
*	t6042: Add failing testcase for rename/modify/add-source conflict	Elijah Newren	2011-08-14	1	-0/+39
*	t6042: Add a testcase where git deletes an untracked file	Elijah Newren	2011-08-14	1	-0/+36