git-merge-ours: make it a builtin.
[gitweb.git] / contrib / vim / syntax /
drwxr-xr-x   parent (dest: contrib/vim; base: a00a42ae33708caa742d9e9fbf10692cfa42f032)
-rw-r--r-- 798 gitcommit.vim