Merge branch 'da/mergetool-trust-exit-code'
[gitweb.git] / t / t4034 / java /
drwxr-xr-x   parent (dest: t/t4034; base: c4a44e23e03c4a1558a21c15bb880c9411a37fd5)
-rw-r--r-- 2121 expect
-rw-r--r-- 271 post
-rw-r--r-- 253 pre