Allow the default low-level merge driver to be configured.
[gitweb.git] / contrib / examples /
drwxr-xr-x   parent (dest: contrib; base: be89cb239e8ec02e23015675cc8b2d60992a6cfc)
-rwxr-xr-x 609 git-gc.sh
-rwxr-xr-x 2715 git-resolve.sh