cherry-pick/revert: make direct internal call to merge_tree()
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 6eb1b437933e075bd84c5cdcf5de95ed4db4820f)
-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