merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
[gitweb.git] / t / t4034 / java /
drwxr-xr-x   parent (dest: t/t4034; base: 6d63070cacf88cd03b4bc73fd64fea046accd450)
-rw-r--r-- 2121 expect
-rw-r--r-- 271 post
-rw-r--r-- 253 pre