Merge branch 'ls/mergetool-meld-auto-merge'
[git] / contrib / emacs /
drwxr-xr-x   ..
-rw-r--r-- 1173 README
-rw-r--r-- 286 git-blame.el
-rw-r--r-- 374 git.el