merge-ort: copy and adapt merge_3way() from merge-recursive.c
[git] / t / t3901 /
drwxr-xr-x   ..
-rwxr-xr-x 153 8859-1.txt
-rwxr-xr-x 155 utf8.txt