Fix bogus error message from merge-recursive error path
[gitweb.git] / contrib / examples /
drwxr-xr-x   parent (dest: contrib; base: 0424138d5715)
-rwxr-xr-x 609 git-gc.sh
-rwxr-xr-x 2715 git-resolve.sh