Let merge set the default strategy.
[gitweb.git] / contrib / emacs /
drwxr-xr-x   parent (dest: contrib; base: c8e2db00f9622af6e5f640443dfbe63bb1af39e0)
-rw-r--r-- 354 Makefile
-rw-r--r-- 38954 git.el
-rw-r--r-- 5562 vc-git.el