mergetool: honor diff.orderFile
[gitweb.git] / t / t4034 / objc /
drwxr-xr-x   parent (dest: t/t4034; base: 57937f70a0)
-rw-r--r-- 2062 expect
-rw-r--r-- 266 post
-rw-r--r-- 248 pre