summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Note that mtimes may be discarded on mergeStephen Bennett2008-05-081-2/+4
* Document the merge process, take 2Ciaran McCreesh2008-04-241-0/+118