Use merge-recursive in git-checkout -m (branch switching)
[git] / contrib / vim / syntax /
drwxr-xr-x   ..
-rw-r--r-- 800 gitcommit.vim