2 commits

Author	SHA1	Message	Date
Joey Hess	fb155b1e3e	Work around git 2.50 bug that caused it to crash when there is a merge conflict with an unlocked annexed file ... This fixes several test suite failures with git 2.50. See the bug report for the full, gory details.	2025-06-25 13:36:23 -04:00
Joey Hess	64263a8410	bug	2025-06-25 11:41:56 -04:00