merge-recursive: switch from (oid,mode) pairs to a diff_filespec
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 8daec1df03de)
-rw-r--r-- 1173 README
-rw-r--r-- 286 git-blame.el
-rw-r--r-- 374 git.el