Use merge-recursive in git-checkout -m (branch switching)
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: c1a4278e)
-rw-r--r-- 356 Makefile
-rw-r--r-- 43147 git.el
-rw-r--r-- 5797 vc-git.el