| commit | 353f51e1ce3cdabfe827435c6b69d5b26d9f7ce3 | |
| author | Markus Heidelberg <markus.heidelberg@web.de> | |
| Mon, 22 Dec 2008 00:50:00 +0000 (22 01:50 +0100) | ||
| committer | Markus Heidelberg <markus.heidelberg@web.de> | |
| Mon, 22 Dec 2008 01:56:31 +0000 (22 02:56 +0100) | ||
| tree | 3dc0ec9522f909e650f789ec2f47221470fcc3a6 | treesnapshot (tar.gz zip) |
| parent | b4d8daead10f34a45f6933fbf24b2e51e713504b | commitdiff |
| parent | 23ddbb8abed233369d6b37cf0a9455136c180878 | commitdiff |
Merge branch 'vim-runtime'
This is the initial merge of the runtime branch, done with the following
commands:
git merge -s ours --no-commit vim-runtime
git read-tree -u -m HEAD HEAD vim-runtime
git merge-index git-merge-vim-runtime.sh -a
git commit
All the following merges just need this command:
git merge vim-runtime
This is the initial merge of the runtime branch, done with the following
commands:
git merge -s ours --no-commit vim-runtime
git read-tree -u -m HEAD HEAD vim-runtime
git merge-index git-merge-vim-runtime.sh -a
git commit
All the following merges just need this command:
git merge vim-runtime