diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2018-01-18 13:01:45 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-01-18 13:01:45 +1300 |
| commit | ef57ffcedae62fd65dfb1d9964e981f080057ec8 (patch) | |
| tree | adf462d229cdb3410162c9a99dc201e89463d03f /vim/after/syntax/php.vim | |
| parent | Merge branch 'feature/vim-after-s...' into develop (diff) | |
| parent | Always add --log to `git merge` (diff) | |
| download | dotfiles-ef57ffcedae62fd65dfb1d9964e981f080057ec8.tar.gz dotfiles-ef57ffcedae62fd65dfb1d9964e981f080057ec8.zip | |
Merge branch 'feature/git-merge' into develop
* feature/git-merge:
Always add --log to `git merge`
Diffstat (limited to 'vim/after/syntax/php.vim')
0 files changed, 0 insertions, 0 deletions