summaryrefslogtreecommitdiff
path: root/doc/bugs/Test_test__95__mixed__95__conflict__95__resolution_fails_on_Windows_with___34__conflictor_directory_missing__34__.mdwn
Commit message (Expand)AuthorAge
* Windows: Fix bug in direct mode merge code that could cause files in subdirec...Gravatar Joey Hess2013-12-31
* (no commit message)Gravatar Gothmog2013-12-31
* (no commit message)Gravatar Gothmog2013-12-31