object: rename function 'typename' to 'type_name'
Brandon Williams committed over 8 years ago
object_info: change member name from 'typename' to 'type_name'
Brandon Williams committed over 8 years ago
merge-recursive: when comparing files, don't include trees
Elijah Newren committed over 8 years ago
merge-recursive: check for file level conflicts then get new name
Elijah Newren committed over 8 years ago
merge-recursive: add computation of collisions due to dir rename & merging
Elijah Newren committed over 8 years ago
merge-recursive: check for directory level conflicts
Elijah Newren committed over 8 years ago
merge-recursive: add get_directory_renames()
Elijah Newren committed over 8 years ago
merge-recursive: make a helper function for cleanup for handle_renames
Elijah Newren committed over 8 years ago
merge-recursive: split out code for determining diff_filepairs
Elijah Newren committed over 8 years ago
merge-recursive: make !o->detect_rename codepath more obvious
Elijah Newren committed over 8 years ago
merge-recursive: fix leaks of allocated renames and diff_filepairs
Elijah Newren committed over 8 years ago
merge-recursive: introduce new functions to handle rename logic
Elijah Newren committed over 8 years ago
merge-recursive: move the get_renames() function
Elijah Newren committed over 8 years ago
directory rename detection: tests for handling overwriting dirty files
Elijah Newren committed over 8 years ago
directory rename detection: tests for handling overwriting untracked files
Elijah Newren committed over 8 years ago
directory rename detection: miscellaneous testcases to complete coverage
Elijah Newren committed over 8 years ago
directory rename detection: testcases exploring possibly suboptimal merges
Elijah Newren committed over 8 years ago
directory rename detection: more involved edge/corner testcases
Elijah Newren committed over 8 years ago
directory rename detection: testcases checking which side did the rename
Elijah Newren committed over 8 years ago
directory rename detection: files/directories in the way of some renames
Elijah Newren committed over 8 years ago