cherry-pick/revert: add scissors line on merge conflict
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 1a2b985fb375e7ce14932bfc59365024af2fb6ab)
-rw-r--r-- 1173 README
-rw-r--r-- 286 git-blame.el
-rw-r--r-- 374 git.el