merge-recursive: separate message for common ancestors
[gitweb.git] / t / t4034 / ruby /
drwxr-xr-x   parent (dest: t/t4034; base: e0453cd8f09aa03f3752d994011963ced7dea3ee)
-rw-r--r-- 1989 expect
-rw-r--r-- 234 post
-rw-r--r-- 228 pre