merge-recursive: improve handling for rename/rename(2to1) conflicts
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: bbafc9c44ae7109f636772350934b3c5d747da44)
-rw-r--r-- 1173 README
-rw-r--r-- 286 git-blame.el
-rw-r--r-- 374 git.el