mergetool: Add prompt to continue after failing to merge a file
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: b0169d84df4c09ed7dfcc6aea5aecd177ddda75b)
-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