merge-recursive: move the global obuf to struct merge_options
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: c7d849243a4be2c60ff48cc42ea8b0518bb7f27f)
-rw-r--r-- 408 Makefile
-rw-r--r-- 15566 git-blame.el
-rw-r--r-- 64730 git.el
-rw-r--r-- 8032 vc-git.el