summaryrefslogtreecommitdiff
path: root/test/end-to-end/built-in-rules/generic_conflict.sh
AgeCommit message (Collapse)Author
2025-04-23Make end-to-end tests independent of the user's configurationKlaus Aehlig
End-to-end tests should, like all tests, be independent of any non-project files the user has in their home directory. This also applies when running the tests locally. In particular, end-to-end tests should not read the user's ~/.just-mrrc. Therefore, properly set --norc in all end-to-end tests (where this is not already the case).
2025-01-24Add test verifying the "generic" rule properly detecs staging conflictsKlaus Aehlig