t6044: recursive can silently incorporate dirty changes in a merge