merge-tree: don't print entries that match "local"
[gitweb.git] / t / t4034 / pascal /
drwxr-xr-x   parent (dest: t/t4034; base: aacecc3)
-rw-r--r-- 2045 expect
-rw-r--r-- 238 post
-rw-r--r-- 232 pre