rerere: teach rerere to handle nested conflicts
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: 4af3220)
-rw-r--r-- 1173 README
-rw-r--r-- 286 git-blame.el
-rw-r--r-- 374 git.el