]> git.madduck.net Git - etc/vim.git/commit

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Resolve merge conflict
authorJens Hoepken <jhoepken@gmail.com>
Tue, 19 Mar 2013 12:58:38 +0000 (13:58 +0100)
committerJens Hoepken <jhoepken@gmail.com>
Tue, 19 Mar 2013 12:58:38 +0000 (13:58 +0100)
commit26cfc8ef05385a8b5f526c4d461d982a82b119b2
tree43f2df5bc26d8cc3a7c146d52da6e8221933227d
parenta87c86a61b583e803e8c0237ed569fa4b3119e20
parent3309ad4d293d2431008d7ec56faadfdcf334d5b9
Resolve merge conflict
syntax/mkd.vim