git-submodule: add support for --merge.
[gitweb.git] / t / t9121 /
drwxr-xr-x   parent (dest: t; base: 42b491786260eb17d97ea9fb1c4b70075bca9523)
-rw-r--r-- 1046 renamed-dir.dump