| Age | Commit message (Expand) | Author | Files | Lines |
|---|
| 2025-04-08 | tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm | Elijah Newren | 1 | -97/+28 |
| 2024-11-21 | t: remove TEST_PASSES_SANITIZE_LEAK annotations | Patrick Steinhardt | 1 | -1/+0 |
| 2024-06-11 | merge: fix leaking merge bases | Patrick Steinhardt | 1 | -0/+1 |
| 2023-11-02 | tests: teach callers of test_i18ngrep to use test_grep | Junio C Hamano | 1 | -8/+8 |
| 2022-07-22 | merge: do not abort early if one strategy fails to handle the merge | Elijah Newren | 1 | -1/+1 |
| 2021-08-30 | Merge branch 'en/pull-conflicting-options' | Junio C Hamano | 1 | -9/+9 |
| 2021-07-22 | pull: abort by default when fast-forwarding is not possible | Elijah Newren | 1 | -9/+9 |
| 2021-07-06 | t6402: preserve git exit status code | Đoàn Trần Công Danh | 1 | -68/+64 |
| 2020-11-19 | t6[4-9]*: adjust the references to the default branch name "main" | Johannes Schindelin | 1 | -24/+24 |
| 2020-11-19 | tests: mark tests relying on the current default for `init.defaultBranch` | Johannes Schindelin | 1 | -0/+3 |
| 2020-10-26 | merge tests: expect slight differences in output for recursive vs. ort | Elijah Newren | 1 | -2/+12 |
| 2020-10-26 | merge tests: expect improved directory/file conflict handling in ort | Elijah Newren | 1 | -27/+81 |
| 2020-08-10 | Collect merge-related tests to t64xx | Elijah Newren | 1 | -0/+910 |
