test that git status works with merge conflict in, .gitmodules
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 44ca0c8ed927c8e7525ceec412704ff9967ff6ac)
-rw-r--r-- 397 Makefile
-rw-r--r-- 1470 README
-rw-r--r-- 16931 git-blame.el
-rw-r--r-- 69926 git.el