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
blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
Kirill Smelkov committed about 16 years ago
blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
Kirill Smelkov committed about 16 years ago
Junio C Hamano committed about 16 years ago
Merge branch 'tr/send-email-refuse-sending-unedited-cover-letter'
Junio C Hamano committed about 16 years ago
Merge branch 'ab/send-email-catfile'
Junio C Hamano committed about 16 years ago
Merge branch 'jc/grep-header-all-match-fix'
Junio C Hamano committed about 16 years ago
Merge branch 'jc/no-branch-name-with-dash-at-front'
Junio C Hamano committed about 16 years ago
Merge branch 'jn/gitweb-test-lib'
Junio C Hamano committed about 16 years ago
Merge branch 'bc/fortran-userdiff'
Junio C Hamano committed about 16 years ago
Merge branch 'jk/read-tree-empty'
Junio C Hamano committed about 16 years ago
Merge branch 'rr/format-patch-count-without-merges'
Junio C Hamano committed about 16 years ago