xdl_merge(): fix and simplify conflict handling
[git/dscho.git] / contrib / emacs / 
tree09783bc010a5ac144f1c46b45bd5803751199246
drwxr-xr-x   ..
-rw-r--r-- 6 .gitignore
-rw-r--r-- 356 Makefile
-rw-r--r-- 42759 git.el
-rw-r--r-- 5777 vc-git.el