mergetool: honor diff.orderFile
[gitweb.git] / t / t4034 / cpp /
drwxr-xr-x   parent (dest: t/t4034; base: 57937f70a09c12ef484c290865dac4066d207c9c)
-rw-r--r-- 2121 expect
-rw-r--r-- 271 post
-rw-r--r-- 253 pre