Merge branch 'da/mergetools-meld-output-opt-on-macos'
[gitweb.git] / t / t4034 / java /
drwxr-xr-x   parent (dest: t/t4034; base: 6bbd512374133ff3c1c6b17e080a466b6485ed42)
-rw-r--r-- 2121 expect
-rw-r--r-- 271 post
-rw-r--r-- 253 pre