git-merge-ours: make it a builtin.
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: a00a42ae33708caa742d9e9fbf10692cfa42f032)
-rw-r--r-- 408 Makefile
-rw-r--r-- 15273 git-blame.el
-rw-r--r-- 55620 git.el
-rw-r--r-- 8032 vc-git.el