Fix bogus error message from merge-recursive error path
[git/dscho.git] / contrib / emacs / 
tree6ec91b70fd9538bedae1d2cab088a36f26ba707c
drwxr-xr-x   ..
-rw-r--r-- 6 .gitignore
-rw-r--r-- 360 Makefile
-rw-r--r-- 15273 git-blame.el
-rw-r--r-- 47937 git.el
-rw-r--r-- 6245 vc-git.el