Merge branch 'pw/rebase-i-keep-reword-after-conflict'
[git] / contrib / emacs /
drwxr-xr-x   ..
-rw-r--r-- 1173 README
-rw-r--r-- 286 git-blame.el
-rw-r--r-- 374 git.el