A recently added test fails in environments with Git versions below 2.36. This is because the test verifies functionality that uses `--remerge-diff` added to Git 2.36 (see https://github.blog/2022-04-18-highlights-from-git-2-36/).
Note that it's sufficient to conditionally skip the test only. We don't need to amend logic being tested, as bots are run on Git 2.36 or above.
Note that it's sufficient to conditionally skip the test only. We don't need to amend logic being tested, as bots are run on Git 2.36 or above.
- relates to
-
SKARA-2312 Do not require re-review for a simple merge
- Resolved
- links to
-
Commit(master) openjdk/skara/ef1d1712
-
Review(master) openjdk/skara/1677