builtin/merge.c: fix a bug with trivial merges
[gitweb.git] / contrib / subtree / t /
drwxr-xr-x   parent (dest: contrib/subtree; base: 40d71940b6a0dadb7873cce614992f1d71fcdfbd)
-rw-r--r-- 2322 Makefile
-rwxr-xr-x 34591 t7900-subtree.sh