summaryrefslogtreecommitdiff
path: root/doc/bugs/Merge_involving_symlink_yields_unexpected_results.mdwn
Commit message (Expand)AuthorAge
* Fix bug in automatic merge conflict resolutionGravatar Joey Hess2014-07-08
* confirmedGravatar Joey Hess2014-07-08
* (no commit message)Gravatar zardoz2014-07-07