merge-tree: fix typo in "both changed identically"
[gitweb.git] / t / t4034 / tex /
drwxr-xr-x   parent (dest: t/t4034; base: ab5f42422d7e025c3151d91cc5ec0d20b9a80922)
-rw-r--r-- 343 expect
-rw-r--r-- 84 post
-rw-r--r-- 72 pre