t7610-mergetool: use tabs instead of a mix of tabs and spaces
[gitweb.git] / t / t4034 / java /
drwxr-xr-x   parent (dest: t/t4034; base: 74578618a0b0d291d214779748edfbafdecb4ae3)
-rw-r--r-- 2121 expect
-rw-r--r-- 271 post
-rw-r--r-- 253 pre