xdiff-merge: optionally show conflicts in "diff3 -m" style
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: e0af48e49682ea3345f932f6b9e7fa7c5e5e611a)
-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