merge-recursive: fix the fix to the diff3 common ancestor label
[git.git] / contrib / emacs / 
tree46bb0c0e2d6caa9ee22c812a087a62c0bf8a640e
drwxr-xr-x   ..
-rw-r--r-- 1173 README
-rw-r--r-- 286 git-blame.el
-rw-r--r-- 374 git.el