summaryrefslogtreecommitdiff
path: root/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn
Commit message (Expand)AuthorAge
* finish fixing direct mode merge bug involving unstaged local filesGravatar Joey Hess2014-03-04
* fixed initial reported problem but not out of the woods yet in some related c...Gravatar Joey Hess2014-03-03
* (no commit message)Gravatar http://joeyh.name/2014-03-03