merge-recursive: Move delete/modify handling into dedicated function

Elijah Newren committed about 16 years ago

merge-recursive: Move rename/delete handling into dedicated function

Elijah Newren committed about 16 years ago

merge-recursive: Nuke rename/directory conflict detection

Elijah Newren committed about 16 years ago

merge-recursive: Rename conflict_rename_rename*() for clarity

Elijah Newren committed about 16 years ago

merge-recursive: Small code clarification -- variable name and comments

Elijah Newren committed about 16 years ago

t6036: Add testcase for undetected conflict

Elijah Newren committed about 16 years ago

t6036: Add a second testcase similar to the first but with content changes

Elijah Newren committed about 16 years ago

t6036: Test index and worktree state, not just that merge fails

Elijah Newren committed about 16 years ago

t6020: Add a testcase for modify/delete + directory/file conflict

Elijah Newren committed about 16 years ago

t6020: Modernize style a bit

Elijah Newren committed about 16 years ago

t6022: Add tests for rename/rename combined with D/F conflicts

Elijah Newren committed about 16 years ago

t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)

Elijah Newren committed about 16 years ago

t6022: Add tests with both rename source & dest involved in D/F conflicts

Elijah Newren committed about 16 years ago

t6022: Add tests for reversing order of merges when D/F conflicts present

Elijah Newren committed about 16 years ago

t6022: Add test combinations of {content conflict?, D/F conflict remains?}

Elijah Newren committed about 16 years ago

t6032: Add a test checking for excessive output from merge

Elijah Newren committed about 16 years ago

merge-recursive: Restructure showing how to chain more process_* functions

Junio C Hamano committed about 16 years ago

t3030: Add a testcase for resolvable rename/add conflict with symlinks

Schalk, Ken committed about 16 years ago

Merge branch 'en/rename-d-f' into en/merge-recursive

Junio C Hamano committed about 16 years ago

blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''

Kirill Smelkov committed about 16 years ago