summaryrefslogtreecommitdiff
path: root/tests.branching/merge-explicitly-named-repos.script
Commit message (Expand)AuthorAgeFilesLines
* Rewrite 'merge' commandSam Thursfield2012-09-101-47/+0
* Rewrite edit command to expect SYSTEM STRATUM [CHUNK] parametersJannis Pohlmann2012-09-041-2/+2
* Add mandatory repository parameter to "morph branch"Jannis Pohlmann2012-08-291-6/+5
* Remember repository that was branched off from for merging and editingJannis Pohlmann2012-08-291-2/+2
* Make "morph show-system-branch" anywhere in a workspace, if possibleJannis Pohlmann2012-08-291-3/+3
* Rename the "morph minedir" command to "morph workspace"Jannis Pohlmann2012-08-291-2/+2
* Use repo alias prefixes properly in testsLars Wirzenius2012-05-041-3/+3
* Add "morph merge" subcommandLars Wirzenius2012-03-231-0/+48