Google Git
Sign in
googlers / jrn / git / 41771fa435a44ff8be3f23753bde0309a2a65b03 / t / t6400-merge-df.sh
  1. 6693fb3 t64xx: convert 'test_create_repo' to 'git init' by Elijah Newren · 2 years, 7 months ago
  2. 66c9562 t6400: preserve git ls-files exit status code by Đoàn Trần Công Danh · 3 years, 8 months ago
  3. 5902f5f t6[4-9]*: adjust the references to the default branch name "main" by Johannes Schindelin · 4 years, 4 months ago
  4. 334afbc tests: mark tests relying on the current default for `init.defaultBranch` by Johannes Schindelin · 4 years, 4 months ago
  5. ef52778 merge tests: expect improved directory/file conflict handling in ort by Elijah Newren · 4 years, 4 months ago
  6. 538228e tests: avoid using the branch name `main` by Johannes Schindelin · 4 years, 5 months ago
  7. 919df31 Collect merge-related tests to t64xx by Elijah Newren · 4 years, 7 months ago[Renamed from t/t6020-merge-df.sh]
  8. 65bf820 t6020: new test with interleaved lexicographic ordering of directories by Elijah Newren · 5 years ago
  9. b821ca7 t6020, t6022, t6035: update merge tests to use test helper functions by Elijah Newren · 5 years ago
  10. ad37620 read-cache: fix directory/file conflict handling in read_index_unmerged() by Elijah Newren · 7 years ago
  11. d45366e merge: deprecate 'git merge <message> HEAD <commit>' syntax by Junio C Hamano · 10 years ago
  12. f0fd4d0 merge-recursive: Fix sorting order and directory change assumptions by Elijah Newren · 14 years ago
  13. 5acb623 Merge branch 'en/merge-recursive' by Junio C Hamano · 14 years ago
  14. 892e6f7 test-lib: make test_expect_code a test command by Ævar Arnfjörð Bjarmason · 14 years ago
  15. ef02b31 merge-recursive: Make room for directories in D/F conflicts by Elijah Newren · 14 years ago
  16. 84a08a4 handle_delete_modify(): Check whether D/F conflicts are still present by Elijah Newren · 14 years ago
  17. fa0ae3b t6020: Add a testcase for modify/delete + directory/file conflict by Elijah Newren · 14 years ago
  18. d09c0a3 t6020: Modernize style a bit by Elijah Newren · 14 years ago
  19. 5a2580d merge_recursive: Fix renames across paths below D/F conflicts by Elijah Newren · 15 years ago
  20. 1c9b2d3 Add a reminder test case for a merge with F/D transition by Alex Riesen · 16 years ago
  21. 72d1216 New test case: merge with directory/file conflicts by Fredrik Kuivinen · 19 years ago