@matheusbsbs / matheus-bagliano
Code Commits 81,972 Issues Pulls Cloud Agent CI/CD
jch
bisect jch maint master next seen test todo

merge-recursive: Fix sorting order and directory change assumptions

Elijah Newren committed about 15 years ago

f0fd4d05e8

merge-recursive: Fix recursive case with D/F conflict via add/add conflict

Elijah Newren committed about 15 years ago

7b1c610f84

merge-recursive: Avoid working directory changes during recursive case

Elijah Newren committed about 15 years ago

0b30e81251

merge-recursive: Remember to free generated unique path names

Elijah Newren committed about 15 years ago

3d6b8e884c

merge-recursive: Consolidate different update_stages functions

Elijah Newren committed about 15 years ago

650467cf89

merge-recursive: Mark some diff_filespec struct arguments const

Elijah Newren committed about 15 years ago

0c05942087

merge-recursive: Correct a comment

Elijah Newren committed about 15 years ago

abafc88e76

merge-recursive: Make BUG message more legible by adding a newline

Elijah Newren committed about 15 years ago

c43ba42e8d

t6022: Add testcase for merging a renamed file with a simple change

Elijah Newren committed about 15 years ago

7dd9c304be

t6022: New tests checking for unnecessary updates of files

Elijah Newren committed about 15 years ago

f1a0f457b3

t6022: Remove unnecessary untracked files to make test cleaner

Elijah Newren committed about 15 years ago

5b5261baab

t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify

Elijah Newren committed about 15 years ago

0b35deb378

t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify

Elijah Newren committed about 15 years ago

a0d3311624

t6036: tests for criss-cross merges with various directory/file conflicts

Elijah Newren committed about 15 years ago

827f2b7d29

t6036: criss-cross with weird content can fool git into clean merge

Elijah Newren committed about 15 years ago

96b079e5c9

t6036: Add differently resolved modify/delete conflict in criss-cross test

Elijah Newren committed about 15 years ago

fe7e9c23e4

t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts

Elijah Newren committed about 15 years ago

c6966068fb

t6042: Ensure rename/rename conflicts leave index and workdir in sane state

Elijah Newren committed about 15 years ago

f0b75fcc81

t6042: Add tests for content issues with modify/rename/directory conflicts

Elijah Newren committed about 15 years ago

ac6e839241

t6042: Add a testcase where undetected rename causes silent file deletion

Elijah Newren committed about 15 years ago

a0551f212e
← Newer Page 2780 of 4099 Older →