Documentation/git-merge.txt: Partial rewrite of How Merge Works
[git/gitweb.git] / contrib / emacs / 
treec799dd48599d74f94726313c245545e9287be44c
drwxr-xr-x   ..
-rw-r--r-- 6 .gitignore
-rw-r--r-- 408 Makefile
-rw-r--r-- 15571 git-blame.el
-rw-r--r-- 64706 git.el
-rw-r--r-- 8032 vc-git.el