user-manual: fix inconsistent use of pull and merge
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: fabbd8f6ca610a570d7bfcbbfc80bb0e03247b2a)
-rw-r--r-- 356 Makefile
-rw-r--r-- 13528 git-blame.el
-rw-r--r-- 43660 git.el
-rw-r--r-- 6245 vc-git.el