summaryrefslogtreecommitdiff
path: root/doc/branching-merging-systems.mdwn
Commit message (Expand)AuthorAgeFilesLines
* Add note that the code does not yet match the codeLars Wirzenius2012-03-271-0/+2
* Add "morph merge" subcommandLars Wirzenius2012-03-231-2/+3
* Add documentation for branching and mergingLars Wirzenius2012-03-221-0/+339