diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-31 16:39:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-31 16:39:11 -0400 |
| commit | 54ba0564dba0e6a7a9c5de23488d419b8fb54c08 (patch) | |
| tree | 6ded77a5351650778612f8aac9293e85cd3f7bc1 /doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn | |
| parent | 3d4b0c157e682a4827dd098d256a16d38fbe6d26 (diff) | |
Windows: Fix bug in direct mode merge code that could cause files in subdirectories to go missing.
Diffstat (limited to 'doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn')
| -rw-r--r-- | doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn b/doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn index 0aa24a91e..8dd74acc3 100644 --- a/doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn +++ b/doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn @@ -1164,3 +1164,12 @@ git annex sync cd .. dir repo r1 r2 """]] + +> Yet another wonderful case of \\ vs / confusion. [[fixed|done]]. +> +> That sucked, but I am rather stunned that the rest of the test +> suite passes for you. That's a lot better that it's ever done on windows +> before. Sadly I don't have as much luck on XP, still 9 failing tests +> there. +> +> --[[Joey]] |