rebase: show consistent conflict resolution hint
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 89c7ae9c3bffe599b46a18a9a504fd3e28a9e715)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16931 git-blame.el
-rw-r--r-- 69689 git.el